diff options
| author | obrien <obrien@FreeBSD.org> | 2004-12-20 04:03:05 +0800 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 2004-12-20 04:03:05 +0800 |
| commit | cdb69fb15159e8b4c602cec9949e1d71ab88d13f (patch) | |
| tree | b625b8f4c228afdba0724cded59b2524a1a60164 | |
| parent | 203dddc99d62a25a05fe245b718347ef2b991c12 (diff) | |
| download | freebsd-ports-gnome-cdb69fb15159e8b4c602cec9949e1d71ab88d13f.tar.gz freebsd-ports-gnome-cdb69fb15159e8b4c602cec9949e1d71ab88d13f.tar.zst freebsd-ports-gnome-cdb69fb15159e8b4c602cec9949e1d71ab88d13f.zip | |
Cleaner support -pthreads for 5.0-5.2.1.
| -rw-r--r-- | lang/gcc32/Makefile | 4 | ||||
| -rw-r--r-- | lang/gcc32/files/extrapatch-gcc__config__freebsd-spec.h | 13 | ||||
| -rw-r--r-- | lang/gcc32/files/patch-gcc,config,freebsd-spec.h | 22 |
3 files changed, 22 insertions, 17 deletions
diff --git a/lang/gcc32/Makefile b/lang/gcc32/Makefile index af088cf4a10c..a1276e88d151 100644 --- a/lang/gcc32/Makefile +++ b/lang/gcc32/Makefile @@ -35,10 +35,6 @@ NOMANCOMPRESS= yes # too hard to deal with differences on 5-cur and releng4 .include <bsd.port.pre.mk> -.if ${OSVERSION} > 502101 -EXTRA_PATCHES= ${FILESDIR}/extrapatch-gcc__config__freebsd-spec.h -.endif - .if ${PORTOBJFORMAT} == "aout" CONFIGURE_TARGET= ${ARCH}-portbld-freebsdaout${OSREL} .else diff --git a/lang/gcc32/files/extrapatch-gcc__config__freebsd-spec.h b/lang/gcc32/files/extrapatch-gcc__config__freebsd-spec.h deleted file mode 100644 index 0bfd886088c8..000000000000 --- a/lang/gcc32/files/extrapatch-gcc__config__freebsd-spec.h +++ /dev/null @@ -1,13 +0,0 @@ ---- gcc/config/freebsd-spec.h.orig Sat Nov 6 23:39:36 2004 -+++ gcc/config/freebsd-spec.h Sat Nov 6 23:39:59 2004 -@@ -132,8 +132,8 @@ - #if FBSD_MAJOR >= 5 - #define FBSD_LIB_SPEC " \ - %{!shared: \ -- %{!pg: %{pthread:-lc_r} -lc} \ -- %{pg: %{pthread:-lc_r_p} -lc_p} \ -+ %{!pg: %{pthread:-lpthread} -lc} \ -+ %{pg: %{pthread:-lpthread_p} -lc_p} \ - }" - #else - #define FBSD_LIB_SPEC " \ diff --git a/lang/gcc32/files/patch-gcc,config,freebsd-spec.h b/lang/gcc32/files/patch-gcc,config,freebsd-spec.h new file mode 100644 index 000000000000..046cca52e89b --- /dev/null +++ b/lang/gcc32/files/patch-gcc,config,freebsd-spec.h @@ -0,0 +1,22 @@ +--- gcc/config/freebsd-spec.h.orig Tue Mar 2 14:34:55 2004 ++++ gcc/config/freebsd-spec.h Fri Dec 17 11:22:26 2004 +@@ -130,11 +130,19 @@ + }" + #else + #if FBSD_MAJOR >= 5 ++#if __FreeBSD_version < 502102 /* upto FreeBSD 5.2.1 */ + #define FBSD_LIB_SPEC " \ + %{!shared: \ + %{!pg: %{pthread:-lc_r} -lc} \ + %{pg: %{pthread:-lc_r_p} -lc_p} \ + }" ++#else ++#define FBSD_LIB_SPEC " \ ++ %{!shared: \ ++ %{!pg: %{pthread:-lpthread} -lc} \ ++ %{pg: %{pthread:-lpthread_p} -lc_p} \ ++ }" ++#endif /* deal with FreeBSD 5.0 - 5.2.1 */ + #else + #define FBSD_LIB_SPEC " \ + %{!shared: \ |