diff options
| author | James Mills <prologic@shortcircuit.net.au> | 2007-08-25 01:41:36 +1000 |
|---|---|---|
| committer | James Mills <prologic@shortcircuit.net.au> | 2007-08-25 01:41:36 +1000 |
| commit | fc61e967be342f4a820ac83ce272f2f42bfa0b57 (patch) | |
| tree | 5eb9b6a499d26f4b7135a600e48232e51bba25fe | |
| parent | b5876ca58397ec1d194a4be93887d273b45f43cc (diff) | |
| parent | 816352b53231206a2ed0b3fc20f869e9aefaf319 (diff) | |
| download | contrib-fc61e967be342f4a820ac83ce272f2f42bfa0b57.tar.gz contrib-fc61e967be342f4a820ac83ce272f2f42bfa0b57.tar.xz | |
Merge branch '2.3' of crux:/home/crux/scm/ports/contrib into 2.3
| -rw-r--r-- | gdc/.md5sum | 2 | ||||
| -rw-r--r-- | gdc/Pkgfile | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/gdc/.md5sum b/gdc/.md5sum index 734f03ae2..f21bac2af 100644 --- a/gdc/.md5sum +++ b/gdc/.md5sum @@ -1,5 +1,5 @@ 2af3fb599635219171c6ae1f3034888a gcc-core-4.1.2.tar.bz2 75c6d5fa3415d614314caf0f509e8933 gcc-g++-4.1.2.tar.bz2 -facee49bd9f7b3c586d4ed96e9682ead gdc-0.23-src.tar.bz2 +aa4433729015d8b6e7183ab9528ba77c gdc-0.24-src.tar.bz2 30e33e6ecedfc346f48240589414aa92 gdc-4.1.2-fixinc.patch 36fb6ec15a5f2a6572da0b02a3cf9d66 gdc-4.1.2-nocheck-fixincludes.patch diff --git a/gdc/Pkgfile b/gdc/Pkgfile index 6374e4671..dc93fceb8 100644 --- a/gdc/Pkgfile +++ b/gdc/Pkgfile @@ -5,7 +5,7 @@ # Depends on: name=gdc -version=0.23 +version=0.24 gcc_version=4.1.2 release=1 source=(http://dl.sourceforge.net/sourceforge/dgcc/gdc-$version-src.tar.bz2 \ @@ -44,12 +44,10 @@ build() { make check make DESTDIR=$PKG install - # remove un-needed files - find $PKG -name 'README' -exec rm {} \; - rm \ $PKG/usr/lib/libiberty.a \ $PKG/usr/bin/*-linux-gnu-* \ + $PKG/usr/lib/gcc/*/$gcc_version/include/README \ $PKG/usr/man/man1/{cpp,gcc,gcov}.1 rm -r \ @@ -58,9 +56,11 @@ build() { $PKG/usr/man/man7 # remove files already on the system out of the port - for i in $(find $PKG | sed -e "s|$PKG|/|"); do - if [ -e "$i" ] && [ ! -d "$i" ] ; then - rm $PKG/$i + for i in $(pkginfo -l gcc |sed -e "s|^|/|"); do + if [ -e "$i" ] && [ ! -d "$i" ]; then + if [ -e "$PKG$i" ]; then + rm "$PKG$i" + fi fi done @@ -68,7 +68,7 @@ build() { find $PKG -depth -empty -exec rm -r {} \; # remove build paths from *.la files - for i in `find $PKG -name '*.la' | sed -e "s|$PKG|/|"`; do + for i in $(find $PKG -name '*.la' | sed -e "s|$PKG|/|"); do sed -i "s|-L$SRC[^ ]* ||g" $PKG/$i done |