mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-23 20:51:43 +00:00
Code Issues Releases Activity

Cleaner support -pthreads for 5.0-5.2.1.

Browse Source
This commit is contained in:
David E. O'Brien 2004-12-19 20:03:05 +00:00
parent 9d634a8ffb
commit ee14e2f763
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=124515
3 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lang/gcc32/Makefile
View File

@ -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

13
lang/gcc32/files/extrapatch-gcc__config__freebsd-spec.h
View File

@ -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 " \

22
lang/gcc32/files/patch-gcc,config,freebsd-spec.h Normal file
View File

@ -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: \