Remove pthread patching.
I'm doing this now to ease an upcoming update to R-2.15.2
This commit is contained in:
dcoppa
parent
393a10fbcf
commit
6184068293
@ -1,10 +1,10 @@
|
||||
# $OpenBSD: Makefile,v 1.52 2012/10/12 14:23:13 jeremy Exp $
|
||||
# $OpenBSD: Makefile,v 1.53 2012/10/25 11:59:30 dcoppa Exp $
|
||||
|
||||
SHARED_ONLY= Yes
|
||||
|
||||
COMMENT= powerful math/statistics/graphics language
|
||||
DISTNAME= R-2.15.1
|
||||
REVISION= 4
|
||||
REVISION= 5
|
||||
|
||||
SHARED_LIBS= R 0.0 \
|
||||
Rlapack 30.0 \
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
$OpenBSD: patch-configure,v 1.13 2012/08/29 07:07:24 dcoppa Exp $
|
||||
$OpenBSD: patch-configure,v 1.14 2012/10/25 11:59:30 dcoppa Exp $
|
||||
|
||||
Fix libpthread linking (-lpthread -> -pthread)
|
||||
Unbreak build on powerpc (relocation truncated to fit: R_PPC_GOT16...)
|
||||
|
||||
Fix "--export-dynamic" linker flag
|
||||
|
||||
Fix linking with external libintl
|
||||
|
||||
--- configure.orig Fri Jun 15 00:05:51 2012
|
||||
+++ configure Fri Aug 24 09:55:35 2012
|
||||
+++ configure Thu Oct 25 11:18:35 2012
|
||||
@@ -26048,7 +26048,7 @@ if test "${GCC}" = yes; then
|
||||
## has 32k and so can use -fpic.
|
||||
## However, although the gcc docs do not mention it, it seems s390/s390x
|
||||
@ -58,26 +58,6 @@ Fix linking with external libintl
|
||||
esac
|
||||
|
||||
if test -z "${DYLIB_LD}"; then
|
||||
@@ -35051,8 +35044,8 @@ See config.log for details.
|
||||
Do NOT set JAVA_LIBS/JAVA_CPPFLAGS unless you are sure they are correct!
|
||||
Java/JNI support is optional unless you set either JAVA_LIBS or JAVA_CPPFLAGS." "$LINENO" 5
|
||||
fi
|
||||
- ## some OSes/Javas need -lpthread
|
||||
- LIBS="${LIBS} -lpthread"
|
||||
+ ## some OSes/Javas need -pthread
|
||||
+ LIBS="${LIBS} -pthread"
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
@@ -35081,7 +35074,7 @@ fi
|
||||
$as_echo "$r_cv_jni" >&6; }
|
||||
##AC_MSG_RESULT([$r_cv_jni])
|
||||
if test "${r_cv_jni}" = "yes (with pthreads)"; then
|
||||
- JAVA_LIBS0="${JAVA_LIBS0} -lpthread"
|
||||
+ JAVA_LIBS0="${JAVA_LIBS0} -pthread"
|
||||
fi
|
||||
|
||||
# cache all detected flags
|
||||
@@ -38377,7 +38370,7 @@ fi
|
||||
## use this to pick out gfortran (even though it is unreliable).
|
||||
if test "${ac_cv_fc_compiler_gnu}" = yes; then
|
||||
@ -87,60 +67,6 @@ Fix linking with external libintl
|
||||
fcpicflags="-fPIC"
|
||||
;;
|
||||
*)
|
||||
@@ -39791,13 +39784,13 @@ rm -f core conftest.err conftest.$ac_objext \
|
||||
if test -n "$gl_have_pthread"; then
|
||||
# The program links fine without libpthread. But it may actually
|
||||
# need to link with libpthread in order to create multiple threads.
|
||||
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lpthread" >&5
|
||||
-$as_echo_n "checking for pthread_kill in -lpthread... " >&6; }
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -pthread" >&5
|
||||
+$as_echo_n "checking for pthread_kill in -pthread... " >&6; }
|
||||
if ${ac_cv_lib_pthread_pthread_kill+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
-LIBS="-lpthread $LIBS"
|
||||
+LIBS="-pthread $LIBS"
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
@@ -39836,7 +39829,7 @@ fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_kill" >&5
|
||||
$as_echo "$ac_cv_lib_pthread_pthread_kill" >&6; }
|
||||
if test "x$ac_cv_lib_pthread_pthread_kill" = xyes; then :
|
||||
- LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread
|
||||
+ LIBMULTITHREAD=-pthread LTLIBMULTITHREAD=-pthread
|
||||
# On Solaris and HP-UX, most pthread functions exist also in libc.
|
||||
# Therefore pthread_in_use() needs to actually try to create a
|
||||
# thread: pthread_create from libc will fail, whereas
|
||||
@@ -39852,13 +39845,13 @@ fi
|
||||
|
||||
else
|
||||
# Some library is needed. Try libpthread and libc_r.
|
||||
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lpthread" >&5
|
||||
-$as_echo_n "checking for pthread_kill in -lpthread... " >&6; }
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -pthread" >&5
|
||||
+$as_echo_n "checking for pthread_kill in -pthread... " >&6; }
|
||||
if ${ac_cv_lib_pthread_pthread_kill+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
-LIBS="-lpthread $LIBS"
|
||||
+LIBS="-pthread $LIBS"
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
@@ -39898,8 +39891,8 @@ fi
|
||||
$as_echo "$ac_cv_lib_pthread_pthread_kill" >&6; }
|
||||
if test "x$ac_cv_lib_pthread_pthread_kill" = xyes; then :
|
||||
gl_have_pthread=yes
|
||||
- LIBTHREAD=-lpthread LTLIBTHREAD=-lpthread
|
||||
- LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread
|
||||
+ LIBTHREAD=-pthread LTLIBTHREAD=-pthread
|
||||
+ LIBMULTITHREAD=-pthread LTLIBMULTITHREAD=-pthread
|
||||
fi
|
||||
|
||||
if test -z "$gl_have_pthread"; then
|
||||
@@ -42485,7 +42478,7 @@ else
|
||||
gt_save_CPPFLAGS="$CPPFLAGS"
|
||||
CPPFLAGS="$CPPFLAGS $INCINTL"
|
||||
|
||||
@ -1,11 +1,9 @@
|
||||
$OpenBSD: patch-src_main_Makefile_in,v 1.5 2012/07/04 12:38:06 dcoppa Exp $
|
||||
|
||||
Fix runtime errors due to libpthread undefined symbols
|
||||
$OpenBSD: patch-src_main_Makefile_in,v 1.6 2012/10/25 11:59:30 dcoppa Exp $
|
||||
|
||||
Fix linking with external libintl
|
||||
|
||||
--- src/main/Makefile.in.orig Fri Mar 2 00:02:24 2012
|
||||
+++ src/main/Makefile.in Fri Jun 29 14:07:35 2012
|
||||
+++ src/main/Makefile.in Thu Oct 25 11:27:43 2012
|
||||
@@ -11,6 +11,7 @@ subdir = src/main
|
||||
R_HOME=$(top_builddir)
|
||||
|
||||
@ -14,20 +12,12 @@ Fix linking with external libintl
|
||||
|
||||
SOURCES_C = \
|
||||
CConverters.c CommandLineArgs.c \
|
||||
@@ -98,14 +99,14 @@ EXTRA_STATIC_LIBS = \
|
||||
@@ -98,7 +99,7 @@ EXTRA_STATIC_LIBS = \
|
||||
$(R_ZLIBS) $(R_BZLIBS) $(R_PCRE) $(R_TRE) $(R_XDR) $(R_XZ) $(R_LIBINTL)
|
||||
STATIC_LIBS = $(MAIN_LIBS) $(EXTRA_STATIC_LIBS)
|
||||
|
||||
-EXTRA_LIBS = $(BLAS_LIBS) $(FLIBS) $(R_XTRA_LIBS) @LIBINTL@ $(READLINE_LIBS) $(LIBS)
|
||||
+EXTRA_LIBS = $(BLAS_LIBS) $(FLIBS) $(R_XTRA_LIBS) @LTLIBINTL@ $(READLINE_LIBS) $(LIBS) -pthread
|
||||
+EXTRA_LIBS = $(BLAS_LIBS) $(FLIBS) $(R_XTRA_LIBS) @LTLIBINTL@ $(READLINE_LIBS) $(LIBS)
|
||||
|
||||
R_binary = R.bin
|
||||
R_bin_OBJECTS = Rmain.o @BUILD_LTO_TRUE@@WANT_R_SHLIB_FALSE@$(OBJECTS)
|
||||
@BUILD_LTO_TRUE@@WANT_R_SHLIB_FALSE@R_bin_LDADD = $(MAIN_OBJS) $(EXTRA_STATIC_LIBS) $(EXTRA_LIBS)
|
||||
@BUILD_LTO_FALSE@@WANT_R_SHLIB_FALSE@R_bin_LDADD = libR.a $(EXTRA_LIBS)
|
||||
## Linked against -lRblas becasue -lR is and otherwise ld complains.
|
||||
-@WANT_R_SHLIB_TRUE@R_bin_LDADD = -L../../lib@R_ARCH@ -lR @BLAS_SHLIB_TRUE@-lRblas
|
||||
+@WANT_R_SHLIB_TRUE@R_bin_LDADD = -L../../lib@R_ARCH@ -lR @BLAS_SHLIB_TRUE@-lRblas -pthread
|
||||
@BUILD_LTO_FALSE@R_bin_DEPENDENCIES =@WANT_R_SHLIB_FALSE@ libR.a @USE_EXPORTFILES_TRUE@ $(top_builddir)/etc/R.exp
|
||||
|
||||
libR_la = libR$(DYLIB_EXT)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user