diff options
Diffstat (limited to 'sci-astronomy/astrometry/files/0.52-as-needed.patch')
| -rw-r--r-- | sci-astronomy/astrometry/files/0.52-as-needed.patch | 87 |
1 files changed, 87 insertions, 0 deletions
diff --git a/sci-astronomy/astrometry/files/0.52-as-needed.patch b/sci-astronomy/astrometry/files/0.52-as-needed.patch new file mode 100644 index 0000000..0d619cf --- /dev/null +++ b/sci-astronomy/astrometry/files/0.52-as-needed.patch @@ -0,0 +1,87 @@ +diff -wurN astrometry.net-0.52/util/Makefile astrometry.net-0.52.as-needed/util/Makefile +--- astrometry.net-0.52/util/Makefile 2015-03-06 21:25:23.000000000 +0100 ++++ astrometry.net-0.52.as-needed/util/Makefile 2015-03-10 22:33:56.020047097 +0100 +@@ -175,7 +175,7 @@ + DEP_OBJ += $(addsuffix .o,$(PROGS)) + + an-pnmtofits: an-pnmtofits.o $(ANFILES_SLIB) +- $(CC) -o $@ $(LDFLAGS) $^ $(NETPBM_LIB) $(LDLIBS) ++ $(CC) $(LDFLAGS) $^ $(NETPBM_LIB) $(LDLIBS) -o $@ + ALL_OBJ += an-pnmtofits.o + + _util$(PYTHON_SO_EXT): util.i lanczos.i $(ANFILES_SLIB) +@@ -264,32 +264,32 @@ + @echo + @echo "Testing canonicalize_file_name..." + @echo "Testing canonicalize_file_name..." >> os-features.log +- (($(CC) -o os-features-test-canonicalize \ +- $(CFLAGS) -DTEST_CANONICALIZE_FILE_NAME $^ $(LDFLAGS) >> os-features.log && \ ++ (($(CC) $(LDFLAGS) \ ++ $(CFLAGS) -DTEST_CANONICALIZE_FILE_NAME $^ -o os-features-test-canonicalize >> os-features.log && \ + ./os-features-test-canonicalize >> os-features.log && \ + echo "#define NEED_CANONICALIZE_FILE_NAME 0") \ + || echo "#define NEED_CANONICALIZE_FILE_NAME 1") >> $@.tmp + @echo + @echo "Testing declare qsort_r..." + @echo "Testing declare qsort_r..." >> os-features.log +- (($(CC) -o os-features-test-declare-qsort \ +- $(CFLAGS) -DTEST_DECLARE_QSORT_R $^ $(LDFLAGS) >> os-features.log && \ ++ (($(CC) $(LDFLAGS) \ ++ $(CFLAGS) -DTEST_DECLARE_QSORT_R $^ -o os-features-test-declare-qsort >> os-features.log && \ + ./os-features-test-declare-qsort >> os-features.log && \ + echo "#define NEED_DECLARE_QSORT_R 1") \ + || echo "#define NEED_DECLARE_QSORT_R 0") >> $@.tmp + @echo + @echo "Testing qsort_r..." + @echo "Testing qsort_r..." >> os-features.log +- (($(CC) -o os-features-test-qsort \ +- $(CFLAGS) -DTEST_QSORT_R $^ $(LDFLAGS) >> os-features.log && \ ++ (($(CC) $(LDFLAGS) \ ++ $(CFLAGS) -DTEST_QSORT_R $^ -o os-features-test-qsort >> os-features.log && \ + ./os-features-test-qsort >> os-features.log && \ + echo "#define NEED_QSORT_R 0") \ + || echo "#define NEED_QSORT_R 1") >> $@.tmp + @echo + @echo "Testing swap qsort_r..." + @echo "Testing swap qsort_r..." >> os-features.log +- (($(CC) -Werror -o os-features-test-swap-qsort \ +- $(CFLAGS) -DTEST_SWAP_QSORT_R $^ $(LDFLAGS) >> os-features.log && \ ++ (($(CC) $(LDFLAGS) -Werror \ ++ $(CFLAGS) -DTEST_SWAP_QSORT_R $^ -o os-features-test-swap-qsort >> os-features.log && \ + ./os-features-test-swap-qsort >> os-features.log && \ + echo "#define NEED_SWAP_QSORT_R 0") \ + || echo "#define NEED_SWAP_QSORT_R 1") >> $@.tmp +@@ -298,8 +298,8 @@ + @echo " NETPBM_INC is $(NETPBM_INC_ORIG)" + @echo " NETPBM_LIB is $(NETPBM_LIB_ORIG)" + @echo "Testing netpbm..." >> os-features.log +- (($(CC) -o os-features-test-netpbm \ +- $(CFLAGS) -DTEST_NETPBM $(NETPBM_INC_ORIG) $^ $(LDFLAGS) $(NETPBM_LIB_ORIG) >> os-features.log && \ ++ (($(CC) $(LDFLAGS) \ ++ $(CFLAGS) -DTEST_NETPBM $(NETPBM_INC_ORIG) $^ -o os-features-test-netpbm $(NETPBM_LIB_ORIG) >> os-features.log && \ + ./os-features-test-netpbm >> os-features.log && \ + echo "#define HAVE_NETPBM 1") \ + || echo "#define HAVE_NETPBM 0") >> $@.tmp +@@ -322,8 +322,8 @@ + -rm -f os-features-makefile.log + ( \ + echo "# This file is generated by util/Makefile."; \ +- (($(CC) -o os-features-test-netpbm-make \ +- $(CFLAGS) -DTEST_NETPBM_MAKE $(NETPBM_INC_ORIG) $^ $(LDFLAGS) $(NETPBM_LIB_ORIG) >> os-features-makefile.log && \ ++ (($(CC) $(LDFLAGS) \ ++ $(CFLAGS) -DTEST_NETPBM_MAKE $(NETPBM_INC_ORIG) $^ -o os-features-test-netpbm-make $(NETPBM_LIB_ORIG) >> os-features-makefile.log && \ + ./os-features-test-netpbm-make >> os-features-makefile.log && \ + echo "HAVE_NETPBM := yes") \ + || (echo "# Astrometry.net didn't find netpbm; not setting HAVE_NETPBM."; \ +diff -wurN astrometry.net-0.52/util/makefile.tests astrometry.net-0.52.as-needed/util/makefile.tests +--- astrometry.net-0.52/util/makefile.tests 2015-03-06 21:25:23.000000000 +0100 ++++ astrometry.net-0.52.as-needed/util/makefile.tests 2015-03-10 22:03:04.734163318 +0100 +@@ -50,7 +50,7 @@ + $(AN_SHELL) $(MAKE_TESTS) $(TEST_SOURCES) > $@ + + test: test.o $(COMMON)/cutest.o $(ALL_TEST_FILES_O) $(sort $(ALL_TEST_EXTRA_OBJS)) $(ALL_TEST_LIBS) +- $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(ALL_TEST_EXTRA_LDFLAGS) $(LDLIBS) ++ $(CC) $(CFLAGS) $(LDFLAGS) $^ $(ALL_TEST_EXTRA_LDFLAGS) $(LDLIBS) -o $@ + + $(ALL_TEST_FILES_O) $(ALL_TEST_FILES_MAIN_O) test.o: %.o: %.c + $(CC) -o $@ $(CFLAGS) -c $< -I$(COMMON) |