diff options
author | fhajny <fhajny@pkgsrc.org> | 2013-05-22 09:39:35 +0000 |
---|---|---|
committer | fhajny <fhajny@pkgsrc.org> | 2013-05-22 09:39:35 +0000 |
commit | 1d46817fb5e9d46343ab36cd43fd37de4154f285 (patch) | |
tree | 46f22dfb3981c1581030a2703f572e44717b9ecd | |
parent | cae32ecb04e93261aa428d6330ea9c061de6d656 (diff) | |
download | pkgsrc-1d46817fb5e9d46343ab36cd43fd37de4154f285.tar.gz |
Fix build on SunOS: call the right configure target, and fix libtool.
-rw-r--r-- | net/liblive/Makefile | 16 | ||||
-rw-r--r-- | net/liblive/distinfo | 4 | ||||
-rw-r--r-- | net/liblive/patches/patch-ba | 12 |
3 files changed, 22 insertions, 10 deletions
diff --git a/net/liblive/Makefile b/net/liblive/Makefile index 784bac7fb4b..ab93540063e 100644 --- a/net/liblive/Makefile +++ b/net/liblive/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2012/10/23 17:18:33 asau Exp $ +# $NetBSD: Makefile,v 1.21 2013/05/22 09:39:35 fhajny Exp $ # DISTNAME= live.2012.02.04 @@ -17,11 +17,23 @@ USE_LIBTOOL= YES INSTALLATION_DIRS= bin lib +.include "../../mk/bsd.fast.prefs.mk" + +.if ${OPSYS} == "SunOS" +. if ${MACHINE_ARCH} == "x86_64" +LIVE_BITNESS= -64bit +. else +LIVE_BITNESS= -32bit +. endif +.else +LIVE_BITNESS= # empty +.endif + do-configure: ${CP} ${FILESDIR}/config.netbsd ${WRKSRC} ${CP} ${FILESDIR}/config.netbsd ${WRKSRC}/config.dragonfly ${CP} ${FILESDIR}/config.netbsd ${WRKSRC}/config.darwin - cd ${WRKSRC} && ${SH} ./genMakefiles ${LOWER_OPSYS} + cd ${WRKSRC} && ${SH} ./genMakefiles ${LOWER_OPSYS}${LIVE_BITNESS} do-install: .for lib in BasicUsageEnvironment UsageEnvironment groupsock liveMedia diff --git a/net/liblive/distinfo b/net/liblive/distinfo index cb09adb3afa..67df87f639e 100644 --- a/net/liblive/distinfo +++ b/net/liblive/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.13 2013/02/22 14:40:07 jperkin Exp $ +$NetBSD: distinfo,v 1.14 2013/05/22 09:39:35 fhajny Exp $ SHA1 (live.2012.02.04.tar.gz) = 26e06f8ec296c3494bc118b7ffde4ad7082e8f80 RMD160 (live.2012.02.04.tar.gz) = 0ff1f656d7244b94820a7ee299d7c96003791b00 Size (live.2012.02.04.tar.gz) = 541332 bytes SHA1 (patch-aa) = ecbf7f9a0d9835fbdb8208d296640570b8770e93 -SHA1 (patch-ba) = 0d977525350b4be3a564060a1d5a561c5564a768 +SHA1 (patch-ba) = dc6fa32b1fa2fcfb84d4917f49c966ea5f938568 SHA1 (patch-ca) = 20d35409d7fe63e0088d3105d5cd54809da13097 SHA1 (patch-cb) = ed98aa446cc4c6cf3c861101637e619d32cc9e95 SHA1 (patch-cc) = 1e968b8742c913f67654d83612bafe4fe01364c0 diff --git a/net/liblive/patches/patch-ba b/net/liblive/patches/patch-ba index 8b3124d30a2..1630642e6d0 100644 --- a/net/liblive/patches/patch-ba +++ b/net/liblive/patches/patch-ba @@ -1,15 +1,15 @@ -$NetBSD: patch-ba,v 1.2 2012/02/21 12:38:58 drochner Exp $ +$NetBSD: patch-ba,v 1.3 2013/05/22 09:39:35 fhajny Exp $ --- config.solaris-32bit.orig 2008-07-25 02:40:05.000000000 +0200 +++ config.solaris-32bit @@ -1,17 +1,20 @@ -COMPILE_OPTS = $(INCLUDES) -I. -O -DSOLARIS -DSOCKLEN_T=socklen_t +.SUFFIXES: .la .lo .cpp -+COMPILE_OPTS = ${INCLUDES} -I. ${CPPFLAGS} -O -DSOLARIS -DSOCKLEN_T=socklen_t ++COMPILE_OPTS = ${INCLUDES} -I. ${CPPFLAGS} -O -DSOLARIS -DSOCKLEN_T=socklen_t -DXLOCALE_NOT_USED=1 C = c -C_COMPILER = cc -C_FLAGS = $(COMPILE_OPTS) -+C_COMPILER = ${LIBTOOL} --mode=compile ${CC} ++C_COMPILER = ${LIBTOOL} --tag=CC --mode=compile ${CC} +C_FLAGS = ${COMPILE_OPTS} CPP = cpp -CPLUSPLUS_COMPILER = c++ @@ -21,14 +21,14 @@ $NetBSD: patch-ba,v 1.2 2012/02/21 12:38:58 drochner Exp $ -LIBRARY_LINK = ld -o -LIBRARY_LINK_OPTS = $(LINK_OPTS) -r -dn -LIB_SUFFIX = a -+CPLUSPLUS_COMPILER = ${LIBTOOL} --mode=compile c++ ++CPLUSPLUS_COMPILER = ${LIBTOOL} --tag=CXX --mode=compile c++ +CPLUSPLUS_FLAGS = ${COMPILE_OPTS} -Wall +OBJ = lo -+LINK = ${LIBTOOL} --mode=link c++ -o ++LINK = ${LIBTOOL} --tag=CXX --mode=link c++ -o +LINK+= # this is needed to add a space! +LINK_OPTS = -Wl,-R${PREFIX}/lib -lm +CONSOLE_LINK_OPTS = ${LINK_OPTS} -+LIBRARY_LINK = ${LIBTOOL} --mode=link c++ -rpath ${PREFIX}/lib -version-info 0:0 -o ++LIBRARY_LINK = ${LIBTOOL} --tag=CXX --mode=link c++ -rpath ${PREFIX}/lib -version-info 0:0 -o +LIBRARY_LINK+= # this is needed to add a space! +LIBRARY_LINK_OPTS = ${LINK_OPTS} -r -dn +LIB_SUFFIX = la |