Sun Nov 2 12:04:47 2008 UTC ()
Pullup ticket #2564 - requested by is
liblive: portability fix
Revisions pulled up:
- net/liblive/distinfo 1.9
- net/liblive/patches/patch-ba 1.1
---
Module Name: pkgsrc
Committed By: is
Date: Thu Oct 30 09:58:46 UTC 2008
Modified Files:
pkgsrc/net/liblive: distinfo
Added Files:
pkgsrc/net/liblive/patches: patch-ba
Log Message:
Libtoolize for Solaris. Otherwise it doesn't build.
(tron)
diff -r1.8 -r1.8.4.1 pkgsrc/net/liblive/distinfo
diff -r0 -r1.1.2.2 pkgsrc/net/liblive/patches/patch-ba
--- pkgsrc/net/liblive/distinfo 2008/07/26 14:44:34 1.8
+++ pkgsrc/net/liblive/distinfo 2008/11/02 12:04:47 1.8.4.1
| @@ -1,5 +1,6 @@ | | | @@ -1,5 +1,6 @@ |
| 1 | $NetBSD: distinfo,v 1.8 2008/07/26 14:44:34 tonio Exp $ | | 1 | $NetBSD: distinfo,v 1.8.4.1 2008/11/02 12:04:47 tron Exp $ |
| 2 | | | 2 | |
| 3 | SHA1 (live.2008.07.25.tar.gz) = fbc84b2b16212a2891d587bff48bfb8822716a7c | | 3 | SHA1 (live.2008.07.25.tar.gz) = fbc84b2b16212a2891d587bff48bfb8822716a7c |
| 4 | RMD160 (live.2008.07.25.tar.gz) = c3a7e8c79ca54753803389e2d0fc9d18fe8c27e6 | | 4 | RMD160 (live.2008.07.25.tar.gz) = c3a7e8c79ca54753803389e2d0fc9d18fe8c27e6 |
| 5 | Size (live.2008.07.25.tar.gz) = 449624 bytes | | 5 | Size (live.2008.07.25.tar.gz) = 449624 bytes |
| | | 6 | SHA1 (patch-ba) = 78e4e13511e02d9f05a568281490d10ad5e6d1b3 |
$NetBSD: patch-ba,v 1.1.2.2 2008/11/02 12:04:47 tron Exp $
--- config.solaris.orig 2008-07-25 02:40:05.000000000 +0200
+++ config.solaris
@@ -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
C = c
-C_COMPILER = cc
-C_FLAGS = $(COMPILE_OPTS)
+C_COMPILER = ${LIBTOOL} --mode=compile ${CC}
+C_FLAGS = ${COMPILE_OPTS}
CPP = cpp
-CPLUSPLUS_COMPILER = c++
-CPLUSPLUS_FLAGS = $(COMPILE_OPTS) -Wall
-OBJ = o
-LINK = c++ -o
-LINK_OPTS = -L.
-CONSOLE_LINK_OPTS = $(LINK_OPTS)
-LIBRARY_LINK = ld -o
-LIBRARY_LINK_OPTS = $(LINK_OPTS) -r -dn
-LIB_SUFFIX = a
+CPLUSPLUS_COMPILER = ${LIBTOOL} --mode=compile c++
+CPLUSPLUS_FLAGS = ${COMPILE_OPTS} -Wall
+OBJ = lo
+LINK = ${LIBTOOL} --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+= # this is needed to add a space!
+LIBRARY_LINK_OPTS = ${LINK_OPTS} -r -dn
+LIB_SUFFIX = la
LIBS_FOR_CONSOLE_APPLICATION = -lsocket -lnsl
LIBS_FOR_GUI_APPLICATION = $(LIBS_FOR_CONSOLE_APPLICATION)
EXE =