attempt to fix busted build on linux due to incomplete libtoolization of pkgdiff -r1.9 -r1.10 pkgsrc/net/liblive/distinfo
(tnn)
| @@ -1,6 +1,7 @@ | @@ -1,6 +1,7 @@ | |||
| 1 | $NetBSD: distinfo,v 1.9 2008/10/30 09:58:46 is Exp $ | 1 | $NetBSD: distinfo,v 1.10 2010/02/02 18:34:03 tnn 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-aa) = bbbc5a265b5570edaab91fda16d077d0cdc0f242 | |||
| 6 | SHA1 (patch-ba) = 78e4e13511e02d9f05a568281490d10ad5e6d1b3 | 7 | SHA1 (patch-ba) = 78e4e13511e02d9f05a568281490d10ad5e6d1b3 |
$NetBSD: patch-aa,v 1.3 2010/02/02 18:34:03 tnn Exp $
--- config.linux.orig 2008-07-25 00:40:05.000000000 +0000
+++ config.linux
@@ -1,17 +1,19 @@
COMPILE_OPTS = $(INCLUDES) -I. -O2 -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64
C = c
-C_COMPILER = cc
+C_COMPILER = ${LIBTOOL} --tag=CC --mode=compile ${CC}
C_FLAGS = $(COMPILE_OPTS)
CPP = cpp
-CPLUSPLUS_COMPILER = c++
+CPLUSPLUS_COMPILER = ${LIBTOOL} --tag=CXX --mode=compile c++
CPLUSPLUS_FLAGS = $(COMPILE_OPTS) -Wall -DBSD=1
-OBJ = o
-LINK = c++ -o
+OBJ = lo
+LINK = ${LIBTOOL} --tag=CXX --mode=link c++ -o
+LINK+= # this is needed to add a space!
LINK_OPTS = -L.
CONSOLE_LINK_OPTS = $(LINK_OPTS)
-LIBRARY_LINK = ld -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 -Bstatic
-LIB_SUFFIX = a
+LIB_SUFFIX = la
LIBS_FOR_CONSOLE_APPLICATION =
LIBS_FOR_GUI_APPLICATION =
EXE =