pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

skalibs: Don't build shared objects for Darwin.



Module Name:	pkgsrc-wip
Committed By:	Christian Koch <cfkoch%edgebsd.org@localhost>
Pushed By:	cfkoch
Date:		Sat Mar 26 12:17:25 2016 -0700
Changeset:	e4d03f3a3fa49e007c6ae223a2f15be638b29d0e

Modified Files:
	skalibs/Makefile
	skalibs/PLIST

Log Message:
skalibs: Don't build shared objects for Darwin.

skalibs' README says so, and this really is the only way you can
successfully build skalibs on OS X.

This change allows execline and s6 to run on OS X.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=e4d03f3a3fa49e007c6ae223a2f15be638b29d0e

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 skalibs/Makefile | 8 ++++++++
 skalibs/PLIST    | 8 ++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diffs:
diff --git a/skalibs/Makefile b/skalibs/Makefile
index 3da98eb..9a80388 100644
--- a/skalibs/Makefile
+++ b/skalibs/Makefile
@@ -13,6 +13,14 @@ USE_LANGUAGES=	c
 HAS_CONFIGURE=	yes
 USE_TOOLS+=	gmake
 
+PLIST_VARS+=	include-shared-objects
+PLIST.include-shared-objects=	yes
+
 CONFIGURE_ARGS+=	"--prefix=${PREFIX}"
 
+.if "${OPSYS}" == "Darwin"
+PLIST.include-shared-objects=	no
+CONFIGURE_ARGS+=	"--disable-shared"
+.endif
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/skalibs/PLIST b/skalibs/PLIST
index f7eb8c4..b37f2cb 100644
--- a/skalibs/PLIST
+++ b/skalibs/PLIST
@@ -83,10 +83,10 @@ include/skalibs/unixmessage.h
 include/skalibs/unixonacid.h
 include/skalibs/ushort.h
 include/skalibs/webipc.h
-lib/libskarnet.so
-lib/libskarnet.so.2.3
-lib/libskarnet.so.2.3.9
-lib/libskarnet.so.${PKGVERSION}
+${PLIST.include-shared-objects}lib/libskarnet.so
+${PLIST.include-shared-objects}lib/libskarnet.so.2.3
+${PLIST.include-shared-objects}lib/libskarnet.so.2.3.9
+${PLIST.include-shared-objects}lib/libskarnet.so.${PKGVERSION}
 lib/skalibs/libskarnet.a
 lib/skalibs/sysdeps/rt.lib
 lib/skalibs/sysdeps/socket.lib


Home | Main Index | Thread Index | Old Index