- Upstream provides soname - Removed namespaced includedir (not in upstream) - pkgconfig file rearrangement now a patch instead of using sedepel9
Sergio Pascual
12 years ago
parent
385ba79ea3
commit
f6008742ab
@ -1,40 +1,38 @@
|
||||
diff -ur cfitsio/Makefile.in cfitsio-zlib/Makefile.in
|
||||
--- cfitsio/Makefile.in 2012-04-24 14:19:09.307351928 +0200
|
||||
+++ cfitsio-zlib/Makefile.in 2012-04-24 14:19:40.906582888 +0200
|
||||
@@ -52,9 +52,7 @@
|
||||
putcolj.c putcolk.c putcoluk.c putcoll.c putcols.c putcolsb.c \
|
||||
diff -ur cfitsio/Makefile.in cfitsio.new/Makefile.in
|
||||
--- cfitsio/Makefile.in 2013-04-08 20:11:42.000000000 +0200
|
||||
+++ cfitsio.new/Makefile.in 2013-07-04 00:03:13.314991071 +0200
|
||||
@@ -61,8 +61,6 @@
|
||||
putcolu.c putcolui.c putcoluj.c putkey.c region.c scalnull.c \
|
||||
swapproc.c wcssub.c wcsutil.c imcompress.c quantize.c ricecomp.c \
|
||||
- pliocomp.c fits_hcompress.c fits_hdecompress.c zuncompress.c zcompress.c \
|
||||
pliocomp.c fits_hcompress.c fits_hdecompress.c zuncompress.c zcompress.c \
|
||||
- adler32.c crc32.c inffast.c inftrees.c trees.c zutil.c \
|
||||
- deflate.c infback.c inflate.c uncompr.c \
|
||||
+ pliocomp.c fits_hcompress.c fits_hdecompress.c zuncompress.c zcompress.c
|
||||
|
||||
SOURCES = ${CORE_SOURCES} @F77_WRAPPERS@
|
||||
|
||||
@@ -87,7 +85,7 @@
|
||||
@@ -95,7 +93,7 @@
|
||||
shared: libcfitsio${SHLIB_SUFFIX}
|
||||
|
||||
libcfitsio${SHLIB_SUFFIX}: ${OBJECTS}
|
||||
- ${SHLIB_LD} ${LDFLAGS} -o $@ ${OBJECTS} -lm ${LIBS}
|
||||
+ ${SHLIB_LD} ${LDFLAGS} -o $@ ${OBJECTS} -lm ${LIBS} -lz
|
||||
|
||||
install: libcfitsio.a $(INSTALL_DIRS)
|
||||
@if [ -f libcfitsio.a ]; then \
|
||||
@@ -109,13 +107,13 @@
|
||||
- ${SHLIB_LD} ${LDFLAGS} -o ${CFITSIO_SHLIB} ${OBJECTS} -lm ${LIBS}
|
||||
+ ${SHLIB_LD} ${LDFLAGS} -o ${CFITSIO_SHLIB} ${OBJECTS} -lm -lz ${LIBS}
|
||||
@if [ "x${CFITSIO_SHLIB_SONAME}" != x ]; then \
|
||||
ln -sf ${CFITSIO_SHLIB} ${CFITSIO_SHLIB_SONAME}; \
|
||||
ln -sf ${CFITSIO_SHLIB_SONAME} $@; \
|
||||
@@ -116,13 +114,13 @@
|
||||
${CC} $(CFLAGS) $(DEFS) -o smem smem.o -L. -lcfitsio -lm
|
||||
|
||||
testprog: testprog.o libcfitsio.a ${OBJECTS}
|
||||
- ${CC} $(CFLAGS) $(DEFS) -o testprog testprog.o -L. -lcfitsio -lm ${LIBS}
|
||||
+ ${CC} $(CFLAGS) $(DEFS) -o testprog testprog.o -L. -lcfitsio -lm ${LIBS} -lz
|
||||
+ ${CC} $(CFLAGS) $(DEFS) -o testprog testprog.o -L. -lcfitsio -lz -lm ${LIBS}
|
||||
|
||||
fpack: fpack.o fpackutil.o libcfitsio.a ${OBJECTS}
|
||||
- ${CC} $(CFLAGS) $(DEFS) -o fpack fpack.o fpackutil.o libcfitsio.a -lm ${LIBS}
|
||||
+ ${CC} $(CFLAGS) $(DEFS) -o fpack fpack.o fpackutil.o -L. -lcfitsio -lm ${LIBS} -lz
|
||||
+ ${CC} $(CFLAGS) $(DEFS) -o fpack fpack.o fpackutil.o -L. -lcfitsio -lz -lm ${LIBS}
|
||||
|
||||
funpack: funpack.o fpackutil.o libcfitsio.a ${OBJECTS}
|
||||
- ${CC} $(CFLAGS) $(DEFS) -o funpack funpack.o fpackutil.o libcfitsio.a -lm ${LIBS}
|
||||
+ ${CC} $(CFLAGS) $(DEFS) -o funpack funpack.o fpackutil.o -L. -lcfitsio -lm ${LIBS} -lz
|
||||
+ ${CC} $(CFLAGS) $(DEFS) -o funpack funpack.o fpackutil.o -L. -lcfitsio -lz -lm ${LIBS}
|
||||
|
||||
fitscopy: fitscopy.o libcfitsio.a ${OBJECTS}
|
||||
${CC} $(CFLAGS) $(DEFS) -o fitscopy fitscopy.o -L. -lcfitsio -lm ${LIBS}
|
||||
|
||||
@ -1,22 +0,0 @@
|
||||
diff -ur cfitsio/configure cfitsio-fixed/configure
|
||||
--- cfitsio/configure 2012-04-13 21:16:16.000000000 +0200
|
||||
+++ cfitsio-fixed/configure 2012-08-30 08:25:25.681081693 +0200
|
||||
@@ -3908,7 +3908,8 @@
|
||||
SHLIB_SUFFIX=".sl"
|
||||
;;
|
||||
lnx)
|
||||
- SHLIB_LD=":"
|
||||
+ SHLIB_LD="cc -shared -Wl,-soname,libcfitsio.so.0"
|
||||
+ SHLIB_SUFFIX=".so.0"
|
||||
;;
|
||||
osf)
|
||||
SHLIB_LD="ld -shared -expect_unresolved '*'"
|
||||
@@ -3929,7 +3930,7 @@
|
||||
# Darwin uses gcc (=cc), but needs different flags (see above)
|
||||
# if test "x$GCC" = xyes; then
|
||||
if test "x$GCC" = xyes && test "x$EXT" != xdarwin && test "x$EXT" != xcygwin; then
|
||||
- SHLIB_LD="$CC -shared"
|
||||
+ SHLIB_LD="$CC -shared -Wl,-soname,libcfitsio.so.0"
|
||||
lhea_shlib_cflags='-fPIC'
|
||||
fi
|
||||
if test "x$lhea_shlib_cflags" != x; then
|
||||
Loading…
Reference in new issue