From e2894e788cd2ca348189c606c8839a05429642e1 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Sun, 26 Aug 2012 07:17:20 +0000 Subject: [PATCH] Remove -pthread patching and sync a bit closer to a pending patch for upstream since the original project is missing libpthread linking all together. from Brad (maintainer) --- devel/orc/Makefile | 5 +++-- devel/orc/patches/patch-configure_ac | 8 ++++---- devel/orc/patches/patch-orc-uninstalled_pc_in | 8 ++++---- devel/orc/patches/patch-orc_Makefile_in | 12 ++++++++++++ devel/orc/patches/patch-orc_pc_in | 16 ++++++++-------- 5 files changed, 31 insertions(+), 18 deletions(-) create mode 100644 devel/orc/patches/patch-orc_Makefile_in diff --git a/devel/orc/Makefile b/devel/orc/Makefile index a7309c6dc69..34167470671 100644 --- a/devel/orc/Makefile +++ b/devel/orc/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.13 2012/01/27 09:44:11 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.14 2012/08/26 07:17:20 ajacoutot Exp $ COMMENT= library and toolset to operate arrays of data DISTNAME= orc-0.4.16 -REVISION= 1 +REVISION= 2 CATEGORIES= devel MASTER_SITES= http://code.entropywave.com/download/orc/ @@ -19,6 +19,7 @@ PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes + WANTLIB= c m pthread USE_GMAKE= Yes diff --git a/devel/orc/patches/patch-configure_ac b/devel/orc/patches/patch-configure_ac index 9d6e152ae90..157787958ed 100644 --- a/devel/orc/patches/patch-configure_ac +++ b/devel/orc/patches/patch-configure_ac @@ -1,12 +1,12 @@ -$OpenBSD: patch-configure_ac,v 1.5 2011/10/04 06:45:41 ajacoutot Exp $ ---- configure.ac.orig Sun Sep 25 17:12:47 2011 -+++ configure.ac Sun Oct 2 23:37:06 2011 +$OpenBSD: patch-configure_ac,v 1.6 2012/08/26 07:17:20 ajacoutot Exp $ +--- configure.ac.orig Sun Oct 2 23:34:22 2011 ++++ configure.ac Thu Aug 16 17:37:55 2012 @@ -171,7 +171,7 @@ ORC_CFLAGS="$ORC_CFLAGS \$(ERROR_CFLAGS) -I\$(top_srcd AC_SUBST(ERROR_CFLAGS) AC_SUBST(ORC_CFLAGS) -ORC_LIBS="\$(top_builddir)/orc/liborc-$ORC_MAJORMINOR.la $LIBM $LIBRT" -+ORC_LIBS="\$(top_builddir)/orc/liborc-$ORC_MAJORMINOR.la -pthread $LIBM $LIBRT" ++ORC_LIBS="\$(top_builddir)/orc/liborc-$ORC_MAJORMINOR.la -lpthread $LIBM $LIBRT" AC_SUBST(ORC_LIBS) #CFLAGS=`echo $CFLAGS | sed s/O2/O0/` diff --git a/devel/orc/patches/patch-orc-uninstalled_pc_in b/devel/orc/patches/patch-orc-uninstalled_pc_in index 2db61181028..619c6f692ca 100644 --- a/devel/orc/patches/patch-orc-uninstalled_pc_in +++ b/devel/orc/patches/patch-orc-uninstalled_pc_in @@ -1,12 +1,12 @@ -$OpenBSD: patch-orc-uninstalled_pc_in,v 1.1.1.1 2010/03/25 10:23:26 sthen Exp $ ---- orc-uninstalled.pc.in.orig Wed Mar 17 19:19:09 2010 -+++ orc-uninstalled.pc.in Wed Mar 17 19:19:40 2010 +$OpenBSD: patch-orc-uninstalled_pc_in,v 1.2 2012/08/26 07:17:20 ajacoutot Exp $ +--- orc-uninstalled.pc.in.orig Tue Apr 12 12:22:03 2011 ++++ orc-uninstalled.pc.in Thu Aug 16 17:37:32 2012 @@ -6,7 +6,7 @@ includedir=${pcfiledir}/ Name: orc-@ORC_MAJORMINOR@ uninstalled Description: Library of Optimized Inner Loops Runtime Compiler Version: @VERSION@ -Libs: -L${libdir} -lorc-@ORC_MAJORMINOR@ @LIBM@ @LIBRT@ -+Libs: -L${libdir} -lorc-@ORC_MAJORMINOR@ -pthread @LIBM@ @LIBRT@ ++Libs: -L${libdir} -lorc-@ORC_MAJORMINOR@ -lpthread @LIBM@ @LIBRT@ Cflags: -I${includedir} orcc=${pcfiledir}/tools/orcc@EXEEXT@ diff --git a/devel/orc/patches/patch-orc_Makefile_in b/devel/orc/patches/patch-orc_Makefile_in new file mode 100644 index 00000000000..4fa9942f0c2 --- /dev/null +++ b/devel/orc/patches/patch-orc_Makefile_in @@ -0,0 +1,12 @@ +$OpenBSD: patch-orc_Makefile_in,v 1.1 2012/08/26 07:17:20 ajacoutot Exp $ +--- orc/Makefile.in.orig Thu Aug 16 20:04:42 2012 ++++ orc/Makefile.in Thu Aug 16 20:05:07 2012 +@@ -322,7 +322,7 @@ top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + lib_LTLIBRARIES = liborc-@ORC_MAJORMINOR@.la +-liborc_@ORC_MAJORMINOR@_la_LIBADD = $(LIBM) $(LIBRT) ++liborc_@ORC_MAJORMINOR@_la_LIBADD = -lpthread $(LIBM) $(LIBRT) + liborc_@ORC_MAJORMINOR@_la_LDFLAGS = \ + -version-info $(ORC_LIBVERSION) \ + -no-undefined -export-symbols-regex 'orc_' diff --git a/devel/orc/patches/patch-orc_pc_in b/devel/orc/patches/patch-orc_pc_in index 174f32d5839..975803a90b5 100644 --- a/devel/orc/patches/patch-orc_pc_in +++ b/devel/orc/patches/patch-orc_pc_in @@ -1,12 +1,12 @@ -$OpenBSD: patch-orc_pc_in,v 1.2 2010/04/09 21:56:05 sthen Exp $ ---- orc.pc.in.orig Fri Mar 19 18:44:36 2010 -+++ orc.pc.in Sat Apr 3 01:02:13 2010 -@@ -8,7 +8,7 @@ toolsdir=${exec_prefix}/bin - Name: orc-@ORC_MAJORMINOR@ +$OpenBSD: patch-orc_pc_in,v 1.3 2012/08/26 07:17:20 ajacoutot Exp $ +--- orc.pc.in.orig Tue Apr 12 12:22:03 2011 ++++ orc.pc.in Thu Aug 16 17:37:15 2012 +@@ -9,7 +9,7 @@ Name: orc-@ORC_MAJORMINOR@ Description: Library of Optimized Inner Loops Runtime Compiler Version: @VERSION@ --Libs: -L${libdir} -lorc-@ORC_MAJORMINOR@ -+Libs: -L${libdir} -lorc-@ORC_MAJORMINOR@ -pthread - Libs.private: @LIBM@ @LIBRT@ + Libs: -L${libdir} -lorc-@ORC_MAJORMINOR@ +-Libs.private: @LIBM@ @LIBRT@ ++Libs.private: -lpthread @LIBM@ @LIBRT@ Cflags: -I${includedir} + orcc=${toolsdir}/orcc@EXEEXT@