[prev in list] [next in list] [prev in thread] [next in thread]
List: fink-commits
Subject: [cvs] experimental/dmacks/finkinfo adns-1.4-shlibs.info, NONE,
From: Daniel Macks <dmacks () users ! sourceforge ! net>
Date: 2007-04-30 8:04:04
Message-ID: E1HiQrh-0003Te-SV () mail ! sourceforge ! net
[Download RAW message or body]
Update of /cvsroot/fink/experimental/dmacks/finkinfo
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv12930
Added Files:
adns-1.4-shlibs.info adns-1.4-shlibs.patch
Log Message:
ain't pretty, but it compiles
--- NEW FILE: adns-1.4-shlibs.patch ---
diff -Nurd -x'*~' adns-1.4.orig/client/Makefile.in adns-1.4/client/Makefile.in
--- adns-1.4.orig/client/Makefile.in 2006-05-10 06:58:02.000000000 -0400
+++ adns-1.4/client/Makefile.in 2007-04-30 02:40:14.000000000 -0400
@@ -31,10 +31,11 @@
PROGRAMS_ALL= $(PROGRAMS) $(PROGRAMS_LOCAL)
STATIC_LIB= $(ADNSDIR)/libadns.a
+DYNAMIC_LIB= $(srcdir)/../dynamic/$(SHLIBFILE)
ifeq ($(ENABLE_DYNAMIC),elf)
-DYNAMIC_DEP= $(srcdir)/../dynamic/$(SHLIBFILE)
-DYNAMIC_LINK= -L$(srcdir)/../dynamic -ladns
+DYNAMIC_DEP= $(DYNAMIC_LIB)
+DYNAMIC_LINK= $(DYNAMIC_LIB)
DYNAMIC_SUFFIX= _s
else
DYNAMIC_DEP= $(STATIC_LIB)
diff -Nurd -x'*~' adns-1.4.orig/configure adns-1.4/configure
--- adns-1.4.orig/configure 2005-10-15 11:22:08.000000000 -0400
+++ adns-1.4/configure 2007-04-30 02:33:56.000000000 -0400
@@ -1726,12 +1726,11 @@
-SHLIBFORLINK='libadns.so'
-SHLIBSONAME='$(SHLIBFORLINK).$(MAJOR)'
-SHLIBFILE='$(SHLIBSONAME).$(MINOR)'
+SHLIBFORLINK='libadns.dylib'
+SHLIBFILE='libadns.$(MAJOR).$(MINOR)_@VERSION@.dylib'
-SHLIBCC='$(CC) $(CFLAGS) -fpic'
-MKSHLIB_1='$(CC) $(LDFLAGS) -shared -Wl,-soname=$(SHLIBSONAME) -o'
+SHLIBCC='$(CC) $(CFLAGS)'
+MKSHLIB_1='$(CC) $(LDFLAGS) -dynamiclib -install_name ${prefix}/lib/$(SHLIBFILE) -o'
MKSHLIB_2=''
MKSHLIB_3='-lc'
@@ -1885,7 +1884,6 @@
s%@MKSHLIB_3@%$MKSHLIB_3%g
s%@SHLIBFORLINK@%$SHLIBFORLINK%g
s%@SHLIBFILE@%$SHLIBFILE%g
-s%@SHLIBSONAME@%$SHLIBSONAME%g
CEOF
EOF
diff -Nurd -x'*~' adns-1.4.orig/dynamic/Makefile.in adns-1.4/dynamic/Makefile.in
--- adns-1.4.orig/dynamic/Makefile.in 2006-05-10 06:58:02.000000000 -0400
+++ adns-1.4/dynamic/Makefile.in 2007-04-30 02:29:29.000000000 -0400
@@ -23,7 +23,7 @@
srcdir= @srcdir@
VPATH= @srcdir@
-TARGETS= $(SHLIBFILE) $(SHLIBSONAME) $(SHLIBFORLINK)
+TARGETS= $(SHLIBFILE) $(SHLIBFORLINK)
include $(srcdir)/../settings.make
include $(srcdir)/../src/adns.make
@@ -32,17 +32,13 @@
install:
mkdir -p $(libdir)
$(INSTALL_PROGRAM) $(SHLIBFILE) $(libdir)/$(SHLIBFILE)
- ln -sf $(SHLIBFILE) $(libdir)/$(SHLIBSONAME)
- ln -sf $(SHLIBSONAME) $(libdir)/$(SHLIBFORLINK)
+ ln -sf $(SHLIBFILE) $(libdir)/$(SHLIBFORLINK)
uninstall:
- rm -f $(libdir)/$(SHLIBFILE) $(libdir)/$(SHLIBSONAME)
+ rm -f $(libdir)/$(SHLIBFILE)
$(SHLIBFORLINK):
- ln -s $(SHLIBSONAME) $(SHLIBFORLINK)
-
-$(SHLIBSONAME):
- ln -s $(SHLIBFILE) $(SHLIBSONAME)
+ ln -s $(SHLIBFILE) $(SHLIBFORLINK)
$(SHLIBFILE): $(ALLOBJS)
rm -f $@
@@ -50,6 +46,6 @@
%_p.o: $(srcdir)/../src/%.c $(srcdir)/../src/adns.h \
$(srcdir)/../src/internal.h $(srcdir)/../src/config.h
- $(SHLIBCC) -I$(srcdir)/../src -c -o $@ $<
+ $(SHLIBCC) -I$(srcdir)/../src -c -o $@ $< -fno-common
$(LIBOBJS):
diff -Nurd -x'*~' adns-1.4.orig/settings.make.in adns-1.4/settings.make.in
--- adns-1.4.orig/settings.make.in 2006-06-06 15:38:16.000000000 -0400
+++ adns-1.4/settings.make.in 2007-04-30 02:29:29.000000000 -0400
@@ -24,7 +24,6 @@
MAJOR= 1
MINOR= 3
SHLIBFILE= @SHLIBFILE@
-SHLIBSONAME= @SHLIBSONAME@
SHLIBFORLINK= @SHLIBFORLINK@
CC= @CC@
diff -Nurd -x'*~' adns-1.4.orig/src/internal.h adns-1.4/src/internal.h
--- adns-1.4.orig/src/internal.h 2006-04-08 10:36:57.000000000 -0400
+++ adns-1.4/src/internal.h 2007-04-30 02:31:39.000000000 -0400
@@ -178,7 +178,7 @@
struct allocnode *next, *back;
} allocnode;
-union maxalign {
+typedef union maxalign {
byte d[1];
struct in_addr ia;
long l;
--- NEW FILE: adns-1.4-shlibs.info ---
Package: adns-1.4-shlibs
Version: 1.4
Revision: 1
Description: Asynchronous DNS library and utilities
License: GPL
Maintainer: None <fink-devel@lists.sourceforge.net>
Source: http://www.chiark.greenend.org.uk/~ian/adns/ftp/adns-%v.tar.gz
Source-MD5: 88bc7bbf3f62a8d4fb186b8f72ead853
PatchScript: <<
sed -e 's/@VERSION@/%v/' < %a/%n.patch | patch -p1
<<
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
#InstallScript: <<
# mkdir -p %i/lib
# install -m 644 src/libadns.a %i/lib
# ranlib %i/lib/libadns.a
#
# mkdir -p %i/include
# install -m 644 src/adns.h %i/include
#
# mkdir -p %i/bin
# install -m 755 client/adnslogres client/adnshost client/adnsresfilter %i/bin
#<<
DocFiles: COPYING GPL-vs-LGPL README* changelog TODO LICENCE.WAIVERS
Shlibs: %p/lib/libadns-1.3_%v.dylib 0.0.0 %n (>= 1.4-1)
SplitOff: <<
Package: dns-1.4-dev
Depends: %N (= %v-%r)
Replaces: adns (<< 1.1-3), adns-dev
BuildDependsOnly: true
Files: lib/libadns.a lib/libadns.dylib include
DocFiles: COPYING GPL-vs-LGPL README* changelog TODO LICENCE.WAIVERS
<<
SplitOff2: <<
Package: adns
Depends: %N (= %v-%r)
Files: bin
DocFiles: COPYING GPL-vs-LGPL README* changelog TODO LICENCE.WAIVERS
<<
Homepage: http://www.chiark.greenend.org.uk/~ian/adns/
DescDetail: <<
adns is an asynchronous resolver library for C (and C++) programs, and a
collection of useful DNS resolver utilities.
<<
DescPort: <<
Hacked dynamic compiling to work on darwin. Upstream doesn't use
libtool and hasn't made any statement about interface stability, so
use %v in SONAME, other things like -release vs -version-info
Hacked internal.h to avoid a common _data symbol (prevents shared
library linking). Not sure this is *correct* but it solved the
linking problem.
CPPFLAGS and LDFLAGS not used consistently, no scrap fink defaults.
<<
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic