Changeset 137299


Ignore:
Timestamp:
Jun 8, 2015, 6:06:10 PM (2 years ago)
Author:
larryv@…
Message:

autoconf, libtool: Use system M4 on Leopard and later

Still trying to minimize dependencies of Autotools and Libtool.

Specific to libtool:

  • Avoid a weird, inadvertent dependency on the m4 port if it's present at compile time.
  • Bake the path to the system M4 into libtoolize to prevent it from picking up different executables depending on whether said m4 port is installed or not. (Setting "M4" in the calling environment will still override libtoolize's default.)
Location:
trunk/dports/devel
Files:
2 added
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/devel/autoconf/Portfile

    r137298 r137299  
    77epoch               1
    88version             2.69
    9 revision            4
     9revision            5
    1010categories          devel
    1111# the license is GPL-3+ with an exception:
     
    2828homepage            http://www.gnu.org/software/autoconf/
    2929
     30depends_lib         port:gettext
    3031installs_libs       no
    31 depends_lib         port:gettext port:m4
    3232
    3333master_sites        gnu
     
    4646        0001-tests-avoid-spurious-test-failure-with-libtool-2.4.3.patch
    4747
     48# The README prescribes GNU M4 1.4.6 or later, which Leopard and later
     49# have. Tiger only provides 1.4.2.
     50if {${os.platform} eq "darwin" && ${os.major} >= 9} {
     51    configure.env       M4=/usr/bin/m4
     52} else {
     53    depends_lib-append  port:m4
     54}
     55
    4856# It should be safe to use the system Perl, since the scripts only use
    4957# core modules. The README prescribes 5.6 or later, and Tiger has 5.8.6.
  • trunk/dports/devel/libtool/Portfile

    r137297 r137299  
    66name                libtool
    77version             2.4.6
     8revision            1
    89categories          devel sysutils
    910platforms           darwin freebsd
     
    2425                    sha256  e3bd4d5d3d025a36c21dd6af7ea818a2afcd4dfc1ea5a17b39d7854bcd0c06e3
    2526
     27# For consistency, always use the M4 detected by configure.
     28patchfiles          hardcode-m4.patch
     29post-patch {
     30    # Stop build from trying to regenerate this after patching.
     31    touch ${worksrcpath}/doc/libtoolize.1
     32}
     33
    2634# Leopard and later provide GNU M4 1.4.6, which works fine. Tiger's
    2735# 1.4.2 does not (#47545).
     
    2937#   - http://lists.gnu.org/archive/html/libtool/2015-01/msg00004.html
    3038if {${os.platform} eq "darwin" && ${os.major} >= 9} {
    31     depends_lib     bin:gm4:m4
     39    configure.env   M4=/usr/bin/m4
    3240} else {
    3341    depends_lib     port:m4
Note: See TracChangeset for help on using the changeset viewer.