Changeset 125362


Ignore:
Timestamp:
Sep 14, 2014, 7:27:18 PM (5 years ago)
Author:
cal@…
Message:

base: Avoid using $GZIP and $BZIP2, since those might be interpreted as flags and cause the build to fail, e.g. #43245

Location:
trunk/base
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/base/Mk/macports.autoconf.mk.in

    r123002 r125362  
    4545LN_S                    = @LN_S@
    4646XCODEBUILD              = @XCODEBUILD@
    47 BZIP2                   = @BZIP2@
    4847
    4948INTREE_TCLSH            = @INTREE_TCLSH@
  • trunk/base/aclocal.m4

    r120074 r125362  
    119119dnl MP_CONFIG_TARBALL([path-to-tarball], [dir-extracted-from-tarball-with-configure], [configure-parameters])
    120120AC_DEFUN([MP_CONFIG_TARBALL], [
    121         AC_PATH_PROG(GZIP, [gzip], [])
    122         AC_PATH_PROG(BZIP2, [bzip2], [])
     121        dnl Warning: Don't use $GZIP and $BZIP2 here, both tools interpret these
     122        dnl env variables as additional parameters.
     123        AC_PATH_PROG(GZIP_BIN, [gzip], [])
     124        AC_PATH_PROG(BZIP2_BIN, [bzip2], [])
    123125
    124126        mp_tarball="$1"
     
    133135                case "$mp_tarball" in
    134136                        *.tar.gz | *.tgz)
    135                                 if test "x$GZIP" = "x"; then
     137                                if test "x$GZIP_BIN" = "x"; then
    136138                                        AC_MSG_ERROR([gzip not found])
    137139                                fi
    138                                 mp_tarball_extract_cmd="$GZIP"
     140                                mp_tarball_extract_cmd="$GZIP_BIN"
    139141                                ;;
    140142                        *.tar.bz2 | *.tbz2)
    141                                 if test "x$BZIP2" = "x"; then
     143                                if test "x$BZIP2_BIN" = "x"; then
    142144                                        AC_MSG_ERROR([bzip2 not found])
    143145                                fi
    144                                 mp_tarball_extract_cmd="$BZIP2"
     146                                mp_tarball_extract_cmd="$BZIP2_BIN"
    145147                                ;;
    146148                        *)
  • trunk/base/configure.ac

    r123007 r125362  
    103103
    104104# Check for user-supplied paths before searching
     105
     106dnl Beware of conflicts between the variables you set and any tools executed in
     107dnl the configure context. Some tools interpret an environment variable with
     108dnl their own name as default flags and will fail if it is set to a path. For
     109dnl example, these include BZIP2 and GZIP, which is the reason why they are
     110dnl named with a _BIN suffix here.
    105111MP_TOOL_PATH(BSDMAKE, [bsdmake/pmake])
    106 MP_TOOL_PATH(BZIP2, [bzip2])
     112MP_TOOL_PATH(BZIP2_BIN, [bzip2])
    107113MP_TOOL_PATH(CVS, [cvs])
    108114MP_TOOL_PATH(GNUMAKE, [gnumake])
     
    123129# Search for tool paths. Any set above (via --with-pkg=PATH) will be retained
    124130AC_PATH_PROGS(BSDMAKE, [bsdmake pmake], [])
    125 AC_PATH_PROG(BZIP2, [bzip2], [])
     131AC_PATH_PROG(BZIP2_BIN, [bzip2], [])
    126132AC_PATH_PROG(BZR, [bzr], [])
    127133AC_PATH_PROG(CHOWN, [chown], [], [$PATH:/usr/sbin])
     
    138144AC_PATH_PROGS(GNUPATCH, [gnupatch gpatch], [])
    139145AC_PATH_PROGS(GNUTAR, [gnutar gtar], [])
    140 AC_PATH_PROG(GZIP, [gzip], [])
     146AC_PATH_PROG(GZIP_BIN, [gzip], [])
    141147AC_PATH_PROG(HDIUTIL, [hdiutil], [])
    142148AC_PATH_PROG(HG, [hg], [])
  • trunk/base/src/macports1.0/macports_autoconf.tcl.in

    r123002 r125362  
    3434
    3535namespace eval macports::autoconf {
    36     variable bzip2_path "@BZIP2@"
     36    variable bzip2_path "@BZIP2_BIN@"
    3737    variable chown_path "@CHOWN@"
    38     variable gzip_path "@GZIP@"
     38    variable gzip_path "@GZIP_BIN@"
    3939    variable macports_conf_path "@MPCONFIGDIR_EXPANDED@"
    4040    variable macports_version "@MACPORTS_VERSION@"
  • trunk/base/src/port1.0/port_autoconf.tcl.in

    r118567 r125362  
    3333
    3434namespace eval portutil::autoconf {
    35         variable bzip2_path "@BZIP2@"
     35        variable bzip2_path "@BZIP2_BIN@"
    3636        variable lzma_path "@LZMA@"
    3737        variable xz_path "@XZ@"
     
    4747        variable git_path "@GIT@"
    4848        variable hg_path "@HG@"
    49         variable gzip_path "@GZIP@"
     49        variable gzip_path "@GZIP_BIN@"
    5050        variable lipo_path "@LIPO@"
    5151        variable openssl_path "@OPENSSL@"
  • trunk/base/src/registry2.0/registry_autoconf.tcl.in

    r79593 r125362  
    3232
    3333namespace eval registry::autoconf {
    34     variable bzip2_path "@BZIP2@"
     34    variable bzip2_path "@BZIP2_BIN@"
    3535}
Note: See TracChangeset for help on using the changeset viewer.