Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/database
In directory vz-cvs-3.sog:/tmp/cvs-serv25878
Modified Files:
rrdtool.info
Added Files:
rrdtool.patch
Log Message:
fix linking against builddir libs the Right Way (as much as possible); disable
lua
--- NEW FILE: rrdtool.patch ---
diff -Nurd -x'*~' rrdtool-1.4.4.orig/bindings/lua/Makefile.in
rrdtool-1.4.4/bindings/lua/Makefile.in
--- rrdtool-1.4.4.orig/bindings/lua/Makefile.in 2010-07-05 15:31:54.000000000
-0400
+++ rrdtool-1.4.4/bindings/lua/Makefile.in 2012-02-09 17:36:11.000000000
-0500
@@ -329,8 +329,8 @@
@LUA_NEED_OUR_COMPAT51_TRUE@rrd_la_SOURCES = rrdlua.c
compat-5.1r5/compat-5.1.c compat-5.1r5/compat-5.1.h
@LUA_NEED_OUR_COMPAT51_TRUE@compatdir = $(LUA_INSTALL_LMOD)
@LUA_NEED_OUR_COMPAT51_TRUE@compat_DATA = compat-5.1r5/compat-5.1.lua
-rrd_la_LIBADD = -lrrd -lm
-rrd_la_LDFLAGS = -module -version-info $(LIB_VERSION_INFO) $(LUA_LFLAGS)
-L$(top_builddir)/src/.libs
+rrd_la_LIBADD = $(top_builddir)/src/librrd.la -lm
+rrd_la_LDFLAGS = -module -version-info $(LIB_VERSION_INFO) $(LUA_LFLAGS)
rrd_la_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir) $(LUA_CFLAGS)
$(LUA_DEFINES) -DLIB_VERSION=\"$(LIB_VERSION)\"
all: all-am
diff -Nurd -x'*~' rrdtool-1.4.4.orig/bindings/tcl/Makefile.in
rrdtool-1.4.4/bindings/tcl/Makefile.in
--- rrdtool-1.4.4.orig/bindings/tcl/Makefile.in 2010-07-05 15:31:54.000000000
-0400
+++ rrdtool-1.4.4/bindings/tcl/Makefile.in 2012-02-09 17:35:50.000000000
-0500
@@ -292,7 +292,7 @@
CLEANFILES = tclrrd.o tclrrd.so
SRC_DIR = $(top_srcdir)/src
AM_CPPFLAGS = $(TCL_INCLUDE_SPEC) -I$(SRC_DIR) -DUSE_TCL_STUBS
-LIBDIRS = -L$(top_builddir)/src/.libs -L$(top_builddir)/src -L$(libdir)
+LIBDIRS = -L$(libdir)
LIB_RUNTIME_DIR = $(libdir)
@BUILD_TCL_SITE_TRUE@tclpkgdir = @TCL_PACKAGE_DIR@
@BUILD_TCL_SITE_TRUE@tclpkg_DATA = pkgIndex.tcl
@@ -651,7 +651,7 @@
all-local: $(TCL_RRD_LIB)
$(TCL_RRD_LIB): tclrrd.o
- $(TCL_SHLIB_LD) $(TCL_LD_SEARCH_FLAGS) $(LIBDIRS) $< -o $@ -lrrd_th -lm
$(TCL_STUB_LIB_SPEC) $(LDFLAGS) $(LIBS)
+ $(TCL_SHLIB_LD) $(TCL_LD_SEARCH_FLAGS) $(LIBDIRS) $< -o $@
$(top_builddir)/src/.libs/librrd_th.dylib -lm $(TCL_STUB_LIB_SPEC) $(LDFLAGS)
$(LIBS)
tclrrd.o: tclrrd.c
$(CC) $(AM_CFLAGS) $(CFLAGS) $(TCL_SHLIB_CFLAGS) $(AM_CPPFLAGS) -c
tclrrd.c -DVERSION=\"$(VERSION)\"
diff -Nurd -x'*~' rrdtool-1.4.4.orig/src/Makefile.in
rrdtool-1.4.4/src/Makefile.in
--- rrdtool-1.4.4.orig/src/Makefile.in 2010-07-05 15:31:55.000000000 -0400
+++ rrdtool-1.4.4/src/Makefile.in 2012-02-09 17:37:21.000000000 -0500
@@ -436,14 +436,14 @@
librrdupd_la_LIBADD = $(CORE_LIBS)
librrd_la_SOURCES = $(RRD_C_FILES)
librrd_la_DEPENDENCIES = librrdupd.la librrd.sym
-librrd_la_LIBADD = librrdupd.la $(ALL_LIBS)
+librrd_la_LIBADD = librrdupd.la $(ALL_LIBS) -lpng
librrd_la_LDFLAGS = -version-info @LIBVERS@ -export-symbols librrd.sym
librrd_th_la_SOURCES = $(UPD_C_FILES) $(RRD_C_FILES) rrd_thread_safe.c
librrd_th_la_DEPENDENCIES = librrd.sym
librrd_th_la_CFLAGS = $(AM_CFLAGS) $(MULTITHREAD_CFLAGS)
librrd_th_la_LDFLAGS = $(MULTITHREAD_LDFLAGS) -version-info @LIBVERS@ \
-export-symbols librrd.sym
-librrd_th_la_LIBADD = $(ALL_LIBS)
+librrd_th_la_LIBADD = $(ALL_LIBS) -lpng
include_HEADERS = rrd.h rrd_format.h rrd_client.h
rrdcgi_SOURCES = rrd_cgi.c
rrdcgi_LDADD = librrd.la
Index: rrdtool.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/database/rrdtool.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- rrdtool.info 21 Jul 2011 20:51:00 -0000 1.1
+++ rrdtool.info 9 Feb 2012 23:00:21 -0000 1.2
@@ -1,7 +1,7 @@
Info4: <<
Package: rrdtool
Version: 1.4.4
-Revision: 2
+Revision: 3
Description: Fixed-size "round-robin" database storage
License: GPL
Maintainer: Benjamin Reed <[email protected]>
@@ -34,18 +34,21 @@
Source: http://oss.oetiker.ch/%n/pub/%n-%v.tar.gz
Source-MD5: 93ad2fc2e9ddcd7d99c611fe30284a54
+PatchFile: %n.patch
+PatchFile-MD5: 7453c62726aaa951d91fe080cc3af651
PatchScript: <<
- perl -pi -e 's/((librrd|librrd_th)_la_LIBADD\s*=.*)/\1 -lpng/'
src/Makefile.in
+ %{default_script}
perl -pi -e 's,/usr/include/libxml2,%p/include/libxml2,g' configure
<<
SetCPPFLAGS: -fno-common -I%p/lib/freetype219/include
-I%p/lib/freetype219/include/freetype2
-UseMaxBuildJobs: true
+UseMaxBuildJobs: false
ConfigureParams: <<
--disable-static \
--enable-shared \
--with-tcllib=%p/lib \
--mandir=%p/share/man \
+--disable-lua \
--disable-perl \
--disable-python \
--disable-ruby
@@ -81,7 +84,6 @@
find %i -name RRDp\* -o -name RRDs\* -exec rm -rf {} \;
rm -rf %i/share/man/man1/RRDp.1 %i/share/man/man1/RRDs.1
install_name_tool -id %p/lib/tclrrd%v.dylib %i/lib/tclrrd%v.dylib
- find %i -name \*.la | xargs perl -pi -e 's,-L%b/src/.libs,,'
<<
DocFiles: CHANGES CONTRIBUTORS COPYING COPYRIGHT NEWS README THREADS TODO
SplitOff: <<
------------------------------------------------------------------------------
Virtualization & Cloud Management Using Capacity Planning
Cloud computing makes use of virtualization - but cloud computing
also focuses on allowing computing to be delivered as a service.
http://www.accelacomm.com/jaw/sfnl/114/51521223/
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
