wcslib/wcslib-cross.patch
Sergio Pascual bd63057041 - New upstream source
- Patch to fix problems compiling i686 in x86_64
2010-12-13 11:53:22 +01:00

48 lines
1.8 KiB
Diff

diff -ur wcslib-4.6.3/configure wcslib-4.6.3.new/configure
--- wcslib-4.6.3/configure 2010-11-24 02:35:31.000000000 +0100
+++ wcslib-4.6.3.new/configure 2010-12-13 11:31:39.519768352 +0100
@@ -9648,7 +9648,7 @@
*)
# Covers Linux and Solaris at least.
SHRLIB="libwcs.so.$V"
- SHRLD="$SHRLD -shared -Wl,-h\$(SHRLIB)"
+ SHRLD="$SHRLD $CFLAGS -shared -Wl,-h\$(SHRLIB)"
SHRLN="libwcs.so"
;;
esac
diff -ur wcslib-4.6.3/utils/GNUmakefile wcslib-4.6.3.new/utils/GNUmakefile
--- wcslib-4.6.3/utils/GNUmakefile 2010-11-16 07:16:20.000000000 +0100
+++ wcslib-4.6.3.new/utils/GNUmakefile 2010-12-13 11:44:09.276785040 +0100
@@ -59,20 +59,20 @@
fitshdr : fitshdr.c
-@ echo ''
$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@.o $<
- $(LD) -o $@ $@.o $(LDFLAGS) $(LIBS)
+ $(LD) $(CFLAGS) -o $@ $@.o $(LDFLAGS) $(LIBS)
-@ $(RM) $@.o
HPXcvt : HPXcvt.c
-@ echo ''
$(CC) $(CPPFLAGS) $(CFITSIOINC) $(CFLAGS) -c -o $@.o $<
- $(LD) -o $@ $@.o $(LDFLAGS) $(CFITSIOLIB) $(LIBS)
+ $(LD) $(CFLAGS) -o $@ $@.o $(LDFLAGS) $(CFITSIOLIB) $(LIBS)
-@ $(RM) $@.o
wcsware : wcsware.c $(GETWCSTAB) $(LIBWCS)
-@ echo ''
$(CC) -DDO_CFITSIO $(CPPFLAGS) -I../pgsbox -I../C $(CFITSIOINC) \
$(CFLAGS) -c -o $@.o $<
- $(LD) $(LDFLAGS) -o $@ $@.o $(GETWCSTAB) $(CFITSIOLIB) $(LIBWCS) \
+ $(LD) $(CFLAGS) $(LDFLAGS) -o $@ $@.o $(GETWCSTAB) $(CFITSIOLIB) $(LIBWCS) \
$(FLIBS) $(LIBS)
-@ $(RM) $@.o
@@ -80,7 +80,7 @@
-@ echo ''
$(CC) -DDO_CFITSIO $(CPPFLAGS) -I../pgsbox -I../C $(PGPLOTINC) \
$(CFITSIOINC) $(CFLAGS) -c -o $@.o $<
- $(LD) $(LDFLAGS) -o $@ $@.o $(PGSBOXLIB) $(PGPLOTLIB) \
+ $(LD) $(CFLAGS) $(LDFLAGS) -o $@ $@.o $(PGSBOXLIB) $(PGPLOTLIB) \
$(GETWCSTAB) $(CFITSIOLIB) $(LIBWCS) $(FLIBS) $(LIBS)
-@ $(RM) $@.o