diff options
Diffstat (limited to 'devel/linuxthreads/files/patch-aa')
| -rw-r--r-- | devel/linuxthreads/files/patch-aa | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/devel/linuxthreads/files/patch-aa b/devel/linuxthreads/files/patch-aa index eaa883bb2c85..02ef0dbe362c 100644 --- a/devel/linuxthreads/files/patch-aa +++ b/devel/linuxthreads/files/patch-aa @@ -13,11 +13,15 @@ diff -ru ../../work/linuxthreads-2.2.3/Examples/Makefile ./Examples/Makefile diff -ru ../../work/linuxthreads-2.2.3/Makefile ./Makefile --- ../../work/linuxthreads-2.2.3/Makefile Wed Apr 25 21:50:59 2001 +++ ./Makefile Thu Jun 7 23:13:52 2001 -@@ -1,128 +1,76 @@ +@@ -1,128 +1,84 @@ -# Copyright (C) 1996,1997,1998,1999,2000,2001 Free Software Foundation, Inc. -# This file is part of the GNU C Library. +LIB=lthread ++.if defined(USING_GCC3) ++SHLIB_MAJOR= 3 ++.else +SHLIB_MAJOR= 2 ++.endif +SHLIB_MINOR= 2 + +.if !defined(MACHINE_ARCH) @@ -29,10 +33,10 @@ diff -ru ../../work/linuxthreads-2.2.3/Makefile ./Makefile +.endif + +.if !defined(PREFIX) -+PREFIX = /usr/local ++PREFIX= ${DESTDIR}/usr/local +.endif + -+LIBDIR = ${PREFIX}/lib ++LIBDIR= ${PREFIX:S,^${DESTDIR},,}/lib + +CFLAGS +=-g -O2 -Wall +#CFLAGS +=-g -O0 -Wall -DDEBUG @@ -60,7 +64,11 @@ diff -ru ../../work/linuxthreads-2.2.3/Makefile ./Makefile + specific.c spinlock.c uthread_file.c wraputhread.c wrapsyscall.c \ + barrier.c localtime.c + ++.if defined(USING_GCC3) ++SOBJS += libgcc_r/unwind-sjlj.o libgcc_r/unwind-dw2.o libgcc_r/unwind-dw2-fde.o ++.else +SOBJS += libgcc_r/frame.o libgcc_r/_eh.o ++.endif + +beforeinstall: + ${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m 0755 \ @@ -1145,7 +1153,12 @@ diff -ru ../../work/linuxthreads-2.2.3/wrapsyscall.c ./wrapsyscall.c /* msync(2). */ -@@ -113,40 +118,50 @@ +@@ -109,44 +114,54 @@ + + /* open(2). */ + CANCELABLE_SYSCALL_VA (int, open, (const char *pathname, int flags, ...), +- (pathname, flags, va_arg (ap, mode_t)), flags) ++ (pathname, flags, va_arg (ap, int)), flags) strong_alias (open, __open) |