cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Drop pthread patches.

Browse Source
This commit is contained in:
ajacoutot 2013-06-01 14:28:28 +00:00
parent 95d85e99e9
commit 7572d9e1b1
10 changed files with 21 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lang/ecl/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.17 2013/03/21 08:46:32 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.18 2013/06/01 14:28:28 ajacoutot Exp $
COMMENT = embeddable common-lisp
CATEGORIES = lang
@ -7,7 +7,7 @@ BROKEN-sparc = infinite loop while building
V = 11.1.1
DISTNAME = ecl-$V
REVISION= 0
REVISION= 1
SHARED_LIBS += ecl 2.0
HOMEPAGE = http://ecls.sourceforge.net/

11
lang/ecl/patches/patch-src_configure
View File

@ -1,15 +1,6 @@
$OpenBSD: patch-src_configure,v 1.3 2011/04/20 15:45:16 shadchin Exp $
$OpenBSD: patch-src_configure,v 1.4 2013/06/01 14:28:28 ajacoutot Exp $
--- src/configure.orig Mon Jan 17 02:39:59 2011
+++ src/configure Mon Apr 18 20:52:32 2011
@@ -4866,7 +4866,7 @@ case "${host_os}" in
SHARED_LDFLAGS="-shared ${LDFLAGS}"
BUNDLE_LDFLAGS="-shared ${LDFLAGS}"
ECL_LDRPATH="-Wl,--rpath,~A"
- clibs="-lpthread -lm"
+ clibs="-pthread -lm"
SONAME="${SHAREDPREFIX}ecl.${SHAREDEXT}.SOVERSION"
SONAME_LDFLAGS="-Wl,-soname,SONAME"
;;
@@ -9120,7 +9120,7 @@ if test ${enable_shared} = "yes"; then
$as_echo "#define ENABLE_DLOPEN 1" >>confdefs.h

5
lang/icon/interp/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.24 2013/03/11 11:20:27 espie Exp $
# $OpenBSD: Makefile,v 1.25 2013/06/01 14:28:28 ajacoutot Exp $
COMMENT-main= programming language with generators, X11 and more
COMMENT-main-no_x11= programming language with generators
@ -14,7 +14,8 @@ DISTFILES= icon.v943src.tgz
MULTI_PACKAGES= -main -compiler
PKGNAME-main= icon-interp-${VERSION}
REVISION-main = 2
REVISION-main = 3
REVISION-compiler = 0
PKGNAME-compiler= icon-compiler-${VERSION}
# Public domain

7
lang/icon/interp/patches/patch-config_bsd_Makedefs
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-config_bsd_Makedefs,v 1.1 2006/10/16 10:01:55 espie Exp $
$OpenBSD: patch-config_bsd_Makedefs,v 1.2 2013/06/01 14:28:28 ajacoutot Exp $
--- config/bsd/Makedefs.orig Thu Jun 16 17:55:17 2005
+++ config/bsd/Makedefs Mon Oct 16 10:57:58 2006
+++ config/bsd/Makedefs Sat Jun 1 16:25:09 2013
@@ -8,12 +8,14 @@
# XPMDEFS definitions for building XPM library
# GDIR directory of graphics helper library
@ -14,11 +14,10 @@ $OpenBSD: patch-config_bsd_Makedefs,v 1.1 2006/10/16 10:01:55 espie Exp $
-RLINK = -Wl,-E
+RLINK =
RLIBS = -lm
-TLIBS = -lpthread
TLIBS = -lpthread
-XLIBS = -Wl,-R/usr/X11R6/lib -L/usr/X11R6/lib -lX11
-XPMDEFS = -DZPIPE -I/usr/X11R6/include
-GDIR = xpm
+TLIBS = -pthread
+XLIBS = -L$(X11BASE)/lib -lXpm -lX11
+XPMDEFS = -DZPIPE -I$(X11BASE)/include
+GDIR =

6
lang/icon/interp/patches/patch-src_common_Makefile
View File

@ -1,13 +1,13 @@
$OpenBSD: patch-src_common_Makefile,v 1.2 2006/10/16 10:01:55 espie Exp $
$OpenBSD: patch-src_common_Makefile,v 1.3 2013/06/01 14:28:28 ajacoutot Exp $
--- src/common/Makefile.orig Sat Jul 5 19:30:35 2003
+++ src/common/Makefile Mon Oct 16 10:46:36 2006
+++ src/common/Makefile Sat Jun 1 16:25:09 2013
@@ -1,3 +1,5 @@
+XLLINK=-L../../bin -lXpm $(XLIBS)
+XPM=xpm
include ../../Makedefs
@@ -5,7 +7,7 @@ OBJS = long.o getopt.o time.o filepart.o
@@ -5,7 +7,7 @@ OBJS = long.o getopt.o time.o filepart.o identify.o st
munix.o literals.o rswitch.o alloc.o long.o getopt.o time.o\
xwindow.o dlrgint.o ipp.o

8
lang/icon/interp/patches/patch-tests_general_Makefile
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-tests_general_Makefile,v 1.1 2006/10/16 10:01:55 espie Exp $
--- tests/general/Makefile.orig Mon Oct 16 11:55:42 2006
+++ tests/general/Makefile Mon Oct 16 11:56:37 2006
@@ -13,7 +13,7 @@ Test Test-icont: Test-programs Test-pre
$OpenBSD: patch-tests_general_Makefile,v 1.2 2013/06/01 14:28:28 ajacoutot Exp $
--- tests/general/Makefile.orig Wed Oct 5 19:28:09 2005
+++ tests/general/Makefile Sat Jun 1 16:25:09 2013
@@ -13,7 +13,7 @@ Test Test-icont: Test-programs Test-preproc Test-opti
# test programs
Programs Programs-icont Test-programs:

3
lang/jamvm/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.19 2013/03/21 08:46:32 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.20 2013/06/01 14:28:28 ajacoutot Exp $
ONLY_FOR_ARCHS= amd64 i386 sparc64
@ -7,6 +7,7 @@ COMMENT= free, standards-compliant jvm with a small footprint
DISTNAME= jamvm-1.5.4
CATEGORIES= lang java
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=jamvm/}
REVISION= 0
SHARED_LIBS= jvm 0.0

28
lang/jamvm/patches/patch-configure
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-configure,v 1.4 2011/09/23 23:39:57 kurt Exp $
$OpenBSD: patch-configure,v 1.5 2013/06/01 14:28:28 ajacoutot Exp $
--- configure.orig Thu Dec 31 13:41:44 2009
+++ configure Wed Sep 14 15:15:27 2011
@@ -2698,6 +2698,7 @@ powerpc*-*-openbsd*) host_cpu=powerpc host_os=bsd libd
@ -9,29 +9,3 @@ $OpenBSD: patch-configure,v 1.4 2011/09/23 23:39:57 kurt Exp $
*) { { $as_echo "$as_me:$LINENO: error: $host not supported" >&5
$as_echo "$as_me: error: $host not supported" >&2;}
{ (exit 1); exit 1; }; } ;;
@@ -21329,13 +21330,13 @@ _ACEOF
else
-{ $as_echo "$as_me:$LINENO: checking for pthread_self in -lpthread" >&5
-$as_echo_n "checking for pthread_self in -lpthread... " >&6; }
+{ $as_echo "$as_me:$LINENO: checking for pthread_self in -pthread" >&5
+$as_echo_n "checking for pthread_self in -pthread... " >&6; }
if test "${ac_cv_lib_pthread_pthread_self+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread $LIBS"
+LIBS="-pthread $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -21399,7 +21400,7 @@ if test "x$ac_cv_lib_pthread_pthread_self" = x""yes; t
#define HAVE_LIBPTHREAD 1
_ACEOF
- LIBS="-lpthread $LIBS"
+ LIBS="-pthread $LIBS"
else
{ { $as_echo "$as_me:$LINENO: error: libpthread is missing" >&5

3
lang/onyx/Makefile
View File

@ -1,10 +1,11 @@
# $OpenBSD: Makefile,v 1.2 2013/03/11 11:20:28 espie Exp $
# $OpenBSD: Makefile,v 1.3 2013/06/01 14:28:28 ajacoutot Exp $
COMMENT= powerful stack-based, multi-threaded language
V= 5.1.2
DISTNAME= onyx-$V
CATEGORIES= lang
REVISION= 0
SHARED_LIBS += onyx 0.0

29
lang/onyx/patches/patch-configure
View File

@ -1,29 +0,0 @@
$OpenBSD: patch-configure,v 1.1.1.1 2011/03/07 19:26:28 jasper Exp $
--- configure.orig Thu Mar 17 08:55:12 2005
+++ configure Thu Mar 3 18:58:05 2011
@@ -3786,13 +3786,13 @@ fi
done
- echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for pthread_create in -pthread" >&5
+echo $ECHO_N "checking for pthread_create in -pthread... $ECHO_C" >&6
if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread $LIBS"
+LIBS="-pthread $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -3851,7 +3851,7 @@ fi
echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6
if test $ac_cv_lib_pthread_pthread_create = yes; then
- LIBS="$LIBS -lpthread"
+ LIBS="$LIBS -pthread"
else
echo "$as_me:$LINENO: checking for pthread_create in -lc_r" >&5
echo $ECHO_N "checking for pthread_create in -lc_r... $ECHO_C" >&6