Merge branch '2.4' of crux:/home/crux/scm/ports/contrib into 2.4
This commit is contained in:
commit
f42e1af07b
@ -14,15 +14,20 @@ lrwxrwxrwx root/root usr/lib/distcc/f95 -> ../../bin/distcc
|
||||
lrwxrwxrwx root/root usr/lib/distcc/gfortran -> ../../bin/distcc
|
||||
drwxr-xr-x root/root usr/lib/gcc/
|
||||
drwxr-xr-x root/root usr/lib/gcc/i686-pc-linux-gnu/
|
||||
drwxr-xr-x root/root usr/lib/gcc/i686-pc-linux-gnu/4.1.2/
|
||||
-rwxr-xr-x root/root usr/lib/gcc/i686-pc-linux-gnu/4.1.2/f951
|
||||
drwxr-xr-x root/root usr/lib/gcc/i686-pc-linux-gnu/4.2.2/
|
||||
-rwxr-xr-x root/root usr/lib/gcc/i686-pc-linux-gnu/4.2.2/f951
|
||||
drwxr-xr-x root/root usr/lib/gcc/i686-pc-linux-gnu/4.2.2/finclude/
|
||||
-rw-r--r-- root/root usr/lib/gcc/i686-pc-linux-gnu/4.2.2/finclude/omp_lib.f90
|
||||
-rw-r--r-- root/root usr/lib/gcc/i686-pc-linux-gnu/4.2.2/finclude/omp_lib.h
|
||||
-rw-r--r-- root/root usr/lib/gcc/i686-pc-linux-gnu/4.2.2/finclude/omp_lib.mod
|
||||
-rw-r--r-- root/root usr/lib/gcc/i686-pc-linux-gnu/4.2.2/finclude/omp_lib_kinds.mod
|
||||
-rw-r--r-- root/root usr/lib/gcc/i686-pc-linux-gnu/4.2.2/libgfortranbegin.a
|
||||
-rwxr-xr-x root/root usr/lib/gcc/i686-pc-linux-gnu/4.2.2/libgfortranbegin.la
|
||||
-rw-r--r-- root/root usr/lib/libgfortran.a
|
||||
-rwxr-xr-x root/root usr/lib/libgfortran.la
|
||||
lrwxrwxrwx root/root usr/lib/libgfortran.so -> libgfortran.so.1.0.0
|
||||
lrwxrwxrwx root/root usr/lib/libgfortran.so.1 -> libgfortran.so.1.0.0
|
||||
-rwxr-xr-x root/root usr/lib/libgfortran.so.1.0.0
|
||||
-rw-r--r-- root/root usr/lib/libgfortranbegin.a
|
||||
-rwxr-xr-x root/root usr/lib/libgfortranbegin.la
|
||||
lrwxrwxrwx root/root usr/lib/libgfortran.so -> libgfortran.so.2.0.0
|
||||
lrwxrwxrwx root/root usr/lib/libgfortran.so.2 -> libgfortran.so.2.0.0
|
||||
-rwxr-xr-x root/root usr/lib/libgfortran.so.2.0.0
|
||||
drwxr-xr-x root/root usr/man/
|
||||
drwxr-xr-x root/root usr/man/man1/
|
||||
-rw-r--r-- root/root usr/man/man1/gfortran.1.gz
|
||||
|
@ -1,4 +1,4 @@
|
||||
2af3fb599635219171c6ae1f3034888a gcc-core-4.1.2.tar.bz2
|
||||
30e33e6ecedfc346f48240589414aa92 gcc-fortran-4.1.2-fixinc.patch
|
||||
36fb6ec15a5f2a6572da0b02a3cf9d66 gcc-fortran-4.1.2-nocheck-fixincludes.patch
|
||||
39621038e425c73f955db8c8db411c34 gcc-fortran-4.1.2.tar.bz2
|
||||
b02a013580a9555c7c8f2ca554c02722 gcc-core-4.2.2.tar.bz2
|
||||
839458a2fcff05c785b2b5d104397396 gcc-fortran-4.2.2-fixinc.patch
|
||||
a617c4d3fa11e0c9410ac213eb061677 gcc-fortran-4.2.2-nocheck-fixincludes.patch
|
||||
d03f61f209ab7fcea7fa648cbd32cc64 gcc-fortran-4.2.2.tar.bz2
|
||||
|
@ -5,8 +5,8 @@
|
||||
# Depends on: mpfr
|
||||
|
||||
name=gcc-fortran
|
||||
version=4.1.2
|
||||
release=3
|
||||
version=4.2.2
|
||||
release=1
|
||||
source=(ftp://sources.redhat.com/pub/gcc/releases/gcc-$version/gcc-{core,fortran}-$version.tar.bz2 \
|
||||
gcc-fortran-$version-nocheck-fixincludes.patch \
|
||||
gcc-fortran-$version-fixinc.patch)
|
||||
@ -54,9 +54,11 @@ build() {
|
||||
$PKG/usr/lib/gcc/*/$version/include
|
||||
|
||||
# remove files already on the system out of the port
|
||||
for i in $(find $PKG | sed -e "s|$PKG|/|"); do
|
||||
for i in $(pkginfo -l gcc |sed -e "s|^|/|"); do
|
||||
if [ -e "$i" ] && [ ! -d "$i" ]; then
|
||||
rm $PKG/$i
|
||||
if [ -e "$PKG$i" ]; then
|
||||
rm "$PKG$i"
|
||||
fi
|
||||
fi
|
||||
done
|
||||
|
||||
|
@ -1,16 +0,0 @@
|
||||
--- gcc-4.1-20060505/gcc/Makefile.in.orig 2006-05-12 12:50:13.051496504 +0200
|
||||
+++ gcc-4.1-20060505/gcc/Makefile.in 2006-05-12 12:51:05.218565904 +0200
|
||||
@@ -3178,12 +3178,7 @@
|
||||
fi
|
||||
rm -rf include; mkdir include
|
||||
-chmod a+rx include
|
||||
- (TARGET_MACHINE='$(target)'; srcdir=`cd $(srcdir); ${PWD_COMMAND}`; \
|
||||
- SHELL='$(SHELL)'; MACRO_LIST=`${PWD_COMMAND}`/macro_list ; \
|
||||
- export TARGET_MACHINE srcdir SHELL MACRO_LIST && \
|
||||
- cd $(build_objdir)/fixincludes && \
|
||||
- $(SHELL) ./fixinc.sh ../../gcc/include \
|
||||
- $(SYSTEM_HEADER_DIR) $(OTHER_FIXINCLUDES_DIRS) )
|
||||
+ cd $(build_objdir)/fixincludes
|
||||
rm -f include/syslimits.h
|
||||
if [ -f include/limits.h ]; then \
|
||||
mv include/limits.h include/syslimits.h; \
|
@ -1,14 +0,0 @@
|
||||
diff -Nru gcc-4.0.3-old/fixincludes/Makefile.in gcc-4.0.3/fixincludes/Makefile.in
|
||||
--- gcc-4.0.3-old/fixincludes/Makefile.in 2006-03-14 02:13:34.000000000 +0100
|
||||
+++ gcc-4.0.3/fixincludes/Makefile.in 2006-03-14 02:17:39.000000000 +0100
|
||||
@@ -163,9 +163,7 @@
|
||||
cp $(srcdir)/../gcc/aclocal.m4 .
|
||||
|
||||
check : all
|
||||
- autogen -T $(srcdir)/check.tpl $(srcdir)/inclhack.def
|
||||
- $(SHELL) ./check.sh $(srcdir)/tests/base
|
||||
- @rm -f ./check.sh
|
||||
+ echo "No check here.."
|
||||
|
||||
install : all
|
||||
-rm -rf $(DESTDIR)$(itoolsdir)
|
16
gcc-fortran/gcc-fortran-4.2.2-fixinc.patch
Normal file
16
gcc-fortran/gcc-fortran-4.2.2-fixinc.patch
Normal file
@ -0,0 +1,16 @@
|
||||
diff -Nru gcc-4.2.1.orig/gcc/Makefile.in gcc-4.2.1/gcc/Makefile.in
|
||||
--- gcc-4.2.1.orig/gcc/Makefile.in 2007-08-15 13:45:59.000000000 +0200
|
||||
+++ gcc-4.2.1/gcc/Makefile.in 2007-08-15 14:57:32.000000000 +0200
|
||||
@@ -3251,12 +3251,6 @@
|
||||
$(MAKE) real-$(INSTALL_HEADERS_DIR) DESTDIR=`pwd`/../gcc/ \
|
||||
libsubdir=. ; \
|
||||
else \
|
||||
- (TARGET_MACHINE='$(target)'; srcdir=`cd $(srcdir); ${PWD_COMMAND}`; \
|
||||
- SHELL='$(SHELL)'; MACRO_LIST=`${PWD_COMMAND}`/macro_list ; \
|
||||
- export TARGET_MACHINE srcdir SHELL MACRO_LIST && \
|
||||
- cd $(build_objdir)/fixincludes && \
|
||||
- $(SHELL) ./fixinc.sh ../../gcc/include \
|
||||
- $(SYSTEM_HEADER_DIR) $(OTHER_FIXINCLUDES_DIRS) ); \
|
||||
rm -f include/syslimits.h; \
|
||||
if [ -f include/limits.h ]; then \
|
||||
mv include/limits.h include/syslimits.h; \
|
14
gcc-fortran/gcc-fortran-4.2.2-nocheck-fixincludes.patch
Normal file
14
gcc-fortran/gcc-fortran-4.2.2-nocheck-fixincludes.patch
Normal file
@ -0,0 +1,14 @@
|
||||
diff -Nru gcc-4.2.1.orig/fixincludes/Makefile.in gcc-4.2.1/fixincludes/Makefile.in
|
||||
--- gcc-4.2.1.orig/fixincludes/Makefile.in 2007-08-15 13:45:59.000000000 +0200
|
||||
+++ gcc-4.2.1/fixincludes/Makefile.in 2007-08-15 14:21:16.000000000 +0200
|
||||
@@ -169,9 +169,7 @@
|
||||
cp $(srcdir)/../gcc/aclocal.m4 .
|
||||
|
||||
check : all
|
||||
- autogen -T $(srcdir)/check.tpl $(srcdir)/inclhack.def
|
||||
- $(SHELL) ./check.sh $(srcdir)/tests/base
|
||||
- @rm -f ./check.sh
|
||||
+ echo "No check here.."
|
||||
|
||||
install : all
|
||||
-rm -rf $(DESTDIR)$(itoolsdir)
|
@ -1 +1 @@
|
||||
065eb84c8da7270309331fc4f81a5152 wgetpaste-2.7.bz2
|
||||
18a9b5c7928dcb1bf487f7b3587da44d wgetpaste-2.8.bz2
|
||||
|
@ -5,7 +5,7 @@
|
||||
# Depends on:
|
||||
|
||||
name=wgetpaste
|
||||
version=2.7
|
||||
version=2.8
|
||||
release=1
|
||||
source=(http://wgetpaste.zlin.dk/wgetpaste-$version.bz2)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user