diff options
| author | dmcmahill <dmcmahill> | 2009-09-24 11:50:56 +0000 |
|---|---|---|
| committer | dmcmahill <dmcmahill> | 2009-09-24 11:50:56 +0000 |
| commit | 9f37b051eba31ed58da5fa6ab9c9ce9c89208d47 (patch) | |
| tree | f37fbe21f785e11e52029f78605e7757d556e29f /lang/gcc44/patches | |
| parent | dba07849009af854405cbcefe559d5ca3a0ef5a1 (diff) | |
| download | pkgsrc-9f37b051eba31ed58da5fa6ab9c9ce9c89208d47.tar.gz | |
- Get rid of a ${WRKDIR} reference in an installed file.
- Fix a bad reference to /bin/bash.
- Work around a non-portable argument to find.
This should address the bash issues reported in PR42092
lang/gcc44 leaves uncorrected reference to /bin/bash
Diffstat (limited to 'lang/gcc44/patches')
| -rw-r--r-- | lang/gcc44/patches/patch-af | 14 | ||||
| -rw-r--r-- | lang/gcc44/patches/patch-ag | 27 |
2 files changed, 41 insertions, 0 deletions
diff --git a/lang/gcc44/patches/patch-af b/lang/gcc44/patches/patch-af new file mode 100644 index 00000000000..2621eca2086 --- /dev/null +++ b/lang/gcc44/patches/patch-af @@ -0,0 +1,14 @@ +$NetBSD: patch-af,v 1.1 2009/09/24 11:50:57 dmcmahill Exp $ + +Avoid a reference to the wrapped make in the pkgsrc work directory from showing up +in an installed file. See ${WRKDIR}/gcc-4.4.1/libjava/contrib/aotcompile.py.in + +--- libjava/configure.orig 2009-07-22 07:43:59.000000000 +0000 ++++ libjava/configure 2009-09-23 12:51:11.000000000 +0000 +@@ -28063,5 +28063,5 @@ + + # needed for aot-compile-rpm +-MAKE=`which make` ++MAKE=${PKGSRC_MAKE} + + diff --git a/lang/gcc44/patches/patch-ag b/lang/gcc44/patches/patch-ag new file mode 100644 index 00000000000..4c4d0e1e83b --- /dev/null +++ b/lang/gcc44/patches/patch-ag @@ -0,0 +1,27 @@ +$NetBSD: patch-ag,v 1.1 2009/09/24 11:50:57 dmcmahill Exp $ + +No need to use bash for this small script. + +Also -print0 is not portable to solaris and perhaps others. + +--- libjava/contrib/rebuild-gcj-db.in.orig 2008-07-02 13:17:54.000000000 +0000 ++++ libjava/contrib/rebuild-gcj-db.in 2009-09-23 12:53:18.000000000 +0000 +@@ -1,3 +1,3 @@ +-#!/bin/bash ++#!/bin/sh + # rebuild-gcj-db + +@@ -17,5 +17,5 @@ + dbLocation=`@prefix@/bin/gcj-dbtool -p $base` + libdir=$base/gcj +- if ! test -d $libdir; then ++ if test ! -d $libdir; then + # No shared libraries here. + continue +@@ -23,5 +23,5 @@ + dirname $dbLocation | xargs mkdir -p + @prefix@/bin/gcj-dbtool -n $dbLocation 64 +- find $libdir -follow -name '*.db' -print0 | \ ++ find $libdir -follow -name '*.db' -print | @AWK@ '{printf("%s%c", $1, 0);}' | \ + @prefix@/bin/gcj-dbtool -0 -m $dbLocation $dbLocation + done |