Ignore:
Timestamp:
Mar 25, 2012, 9:13:27 PM (8 years ago)
Author:
afb@…
Message:

rpm: add +python25 variant, fix +universal variant (#33748)

Location:
trunk/dports/sysutils/rpm
Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/sysutils/rpm/Portfile

    r83498 r91204  
    55name                    rpm
    66version                 4.4.9
    7 revision                12
     7revision                13
    88platforms               darwin freebsd linux
    99license                 GPL-2 LGPL-2
     
    5353                        patch-configure \
    5454                        patch-db3-configure \
     55                        patch-zlib-configure \
    5556                        patch-Makefile.PL \
    5657                        patch-darwin.prov \
     
    127128}
    128129
     130variant python25 description { use python 2.5 instead of python 2.4 } {
     131        depends_build-delete    port:python24
     132        depends_build-append    port:python25
     133        configure.args-delete   --with-python=2.4
     134        configure.args-append   --with-python=2.5
     135        configure.env-delete    __PYTHON=${prefix}/bin/python2.4
     136        configure.env-append    __PYTHON=${prefix}/bin/python2.5
     137}
     138
    129139livecheck.type  regex
    130140# get the last modified tarball
  • trunk/dports/sysutils/rpm/files/patch-configure

    r76681 r91204  
    11--- configure.orig      2007-06-22 01:21:33.000000000 +0200
    22+++ configure   2007-06-22 01:23:43.000000000 +0200
     3@@ -5347,7 +5347,7 @@
     4 
     5 if test "$ac_cv_c_compiler_gnu" = yes; then
     6     CFLAGS="$CFLAGS -fPIC -DPIC -D_GNU_SOURCE -D_REENTRANT -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wno-char-subscripts"
     7-    LDFLAGS="-pie"
     8+    LDFLAGS="$LDFLAGS -pie"
     9 fi
     10 export CFLAGS LDFLAGS
     11 
    312@@ -27309,8 +27309,8 @@
    413 if test $ac_cv_lib_popt_poptGetContext = yes; then
  • trunk/dports/sysutils/rpm/files/patch-db3-configure

    r59467 r91204  
    66 # XXX edit CFLAGS= ... out of invocation args ???
    77-ARGS="`echo $* | sed -e 's% [^ ]*CFLAGS=[^ ]*%%' -e 's% -[^-][^ ]*%%g' -e 's% --param=[^ ]*%%g' -e 's%--cache-file=.*$%%'`"
    8 +ARGS="`echo $* | sed -e 's%-arch [^ ]*%%g' -e 's% [^ ]*CFLAGS=[^ ]*%%' -e 's% -[^-][^ ]*%%g' -e 's% --param=[^ ]*%%g' -e 's%--cache-file=.*$%%'`"
     8+ARGS="`echo $* | sed -e 's%-arch [^ ]*%%g' -e 's% [^ ]*CFLAGS=[^ ]*%%' -e 's% [^ ]*LDFLAGS=[^ ]*%%' -e 's% -[^-][^ ]*%%g' -e 's% --param=[^ ]*%%g' -e 's%--cache-file=.*$%%'`"
    99 
    1010 CC="$CC" CFLAGS="$CFLAGS" $db_dist/configure $ARGS \
    1111        --enable-shared --enable-static --enable-rpc \
     12@@ -10,7 +10,7 @@
     13 # XXX edit CFLAGS= ... out of invocation args ???
     14 ARGS="`echo $* | sed -e 's%-arch [^ ]*%%g' -e 's% [^ ]*CFLAGS=[^ ]*%%' -e 's% -[^-][^ ]*%%g' -e 's% --param=[^ ]*%%g' -e 's%--cache-file=.*$%%'`"
     15 
     16-CC="$CC" CFLAGS="$CFLAGS" $db_dist/configure $ARGS \
     17+CC="$CC" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" $db_dist/configure $ARGS \
     18        --enable-shared --enable-static --enable-rpc \
     19        --with-uniquename=_rpmdb --srcdir=$db_dist
     20 
Note: See TracChangeset for help on using the changeset viewer.