| 1 |
bicatali 10/08/24 20:45:49 |
| 2 |
|
| 3 |
Added: pyxplot-0.8.2-flags.patch |
| 4 |
Log: |
| 5 |
Version bump |
| 6 |
|
| 7 |
(Portage version: 2.2_rc68/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 sci-visualization/pyxplot/files/pyxplot-0.8.2-flags.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/pyxplot/files/pyxplot-0.8.2-flags.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/pyxplot/files/pyxplot-0.8.2-flags.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: pyxplot-0.8.2-flags.patch |
| 16 |
=================================================================== |
| 17 |
--- Makefile.skel.orig 2010-08-24 22:15:23.000000000 +0100 |
| 18 |
+++ Makefile.skel 2010-08-24 22:29:21.000000000 +0100 |
| 19 |
@@ -39,12 +39,13 @@ |
| 20 |
VERSION = 0.8.2 |
| 21 |
DATE = 04/08/2010 |
| 22 |
|
| 23 |
-COMPILE = $(CC) -Wall -g `xml2-config --cflags` `gsl-config --cflags` -c -I $(CWD)/src |
| 24 |
-LINK = $(CC) -Wall -g `xml2-config --libs` `gsl-config --libs` -lm $(LINK_FFTW) $(LINK_READLINE) -lz -lpng $(LINK_KPATHSEA) |
| 25 |
+COMPILE = $(CC) -Wall `xml2-config --cflags` `pkg-config --cflags cfitsio gsl` -c -I $(CWD)/src |
| 26 |
+LIBS = `xml2-config --libs` `pkg-config --libs cfitsio gsl` -lm $(LINK_FFTW) $(LINK_READLINE) -lz -lpng $(LINK_KPATHSEA) |
| 27 |
+LINK = $(CC) |
| 28 |
|
| 29 |
OPTIMISATION = -O0 |
| 30 |
|
| 31 |
-DEBUG = -D DEBUG=1 -D MEMDEBUG1=1 -D MEMDEBUG2=0 |
| 32 |
+DEBUG = -g -D DEBUG=1 -D MEMDEBUG1=1 -D MEMDEBUG2=0 |
| 33 |
NODEBUG = -D DEBUG=0 -D MEMDEBUG1=0 -D MEMDEBUG2=0 |
| 34 |
|
| 35 |
LOCAL_SRCDIR = src |
| 36 |
@@ -101,15 +102,15 @@ |
| 37 |
|
| 38 |
$(LOCAL_OBJDIR)/%.o: $(LOCAL_SRCDIR)/%.c $(ALL_HFILES) |
| 39 |
mkdir -p $(LOCAL_OBJDIR) $(LOCAL_OBJDIR)/EPSMaker $(LOCAL_OBJDIR)/Helpers $(LOCAL_OBJDIR)/ListTools $(LOCAL_OBJDIR)/MathsTools $(LOCAL_OBJDIR)/StringTools |
| 40 |
- $(COMPILE) $(OPTIMISATION) $(NODEBUG) $(NOINSTALL_SWITCHES) $< -o $@ |
| 41 |
+ $(COMPILE) $(CFLAGS) $(NODEBUG) $(NOINSTALL_SWITCHES) $< -o $@ |
| 42 |
|
| 43 |
$(LOCAL_OBJDIR)/%.debug.o: $(LOCAL_SRCDIR)/%.c $(ALL_HFILES) |
| 44 |
mkdir -p $(LOCAL_OBJDIR) $(LOCAL_OBJDIR)/EPSMaker $(LOCAL_OBJDIR)/Helpers $(LOCAL_OBJDIR)/ListTools $(LOCAL_OBJDIR)/MathsTools $(LOCAL_OBJDIR)/StringTools |
| 45 |
- $(COMPILE) $(OPTIMISATION) $(DEBUG) $(DEBUG_SWITCHES) $< -o $@ |
| 46 |
+ $(COMPILE) $(CFLAGS) $(DEBUG) $(DEBUG_SWITCHES) $< -o $@ |
| 47 |
|
| 48 |
$(LOCAL_OBJDIR)/%.install.o: $(LOCAL_SRCDIR)/%.c $(ALL_HFILES) |
| 49 |
mkdir -p $(LOCAL_OBJDIR) $(LOCAL_OBJDIR)/EPSMaker $(LOCAL_OBJDIR)/Helpers $(LOCAL_OBJDIR)/ListTools $(LOCAL_OBJDIR)/MathsTools $(LOCAL_OBJDIR)/StringTools |
| 50 |
- $(COMPILE) $(OPTIMISATION) $(NODEBUG) $(INSTALL_SWITCHES) $< -o $@ |
| 51 |
+ $(COMPILE) $(CFLAGS) $(NODEBUG) $(INSTALL_SWITCHES) $< -o $@ |
| 52 |
|
| 53 |
# |
| 54 |
# Make the pyxplot binaries |
| 55 |
@@ -117,17 +118,17 @@ |
| 56 |
|
| 57 |
$(LOCAL_BINDIR)/pyxplot: $(PPL_OBJECTS) |
| 58 |
mkdir -p $(LOCAL_BINDIR) |
| 59 |
- $(LINK) $(OPTIMISATION) $(PPL_OBJECTS) -o $(LOCAL_BINDIR)/pyxplot |
| 60 |
+ $(LINK) $(LDFLAGS) $(PPL_OBJECTS) $(LIBS) -o $(LOCAL_BINDIR)/pyxplot |
| 61 |
|
| 62 |
$(LOCAL_BINDIR)/debug/pyxplot: $(PPL_OBJECTS_DEBUG) |
| 63 |
mkdir -p $(LOCAL_BINDIR)/debug |
| 64 |
echo "The files in this directory are binaries with debugging options enabled: they produce activity logs called 'pyxplot.log'. It should be noted that these binaries can up to ten times slower than non-debugging versions." > $(LOCAL_BINDIR)/debug/README |
| 65 |
- $(LINK) $(OPTIMISATION) $(PPL_OBJECTS_DEBUG) -o $(LOCAL_BINDIR)/debug/pyxplot |
| 66 |
+ $(LINK) $(LDFLAGS) $(PPL_OBJECTS_DEBUG) $(LIBS) -o $(LOCAL_BINDIR)/debug/pyxplot |
| 67 |
|
| 68 |
$(LOCAL_BINDIR)/install/pyxplot: $(PPL_OBJECTS_INSTALL) |
| 69 |
mkdir -p $(LOCAL_BINDIR)/install |
| 70 |
echo "The files in this directory are binaries intended to be installed with 'make install'. They should not be used in their present location, as they contain hard-coded links to files which are created by the 'make install' step." > $(LOCAL_BINDIR)/debug/README |
| 71 |
- $(LINK) $(OPTIMISATION) $(PPL_OBJECTS_INSTALL) -o $(LOCAL_BINDIR)/install/pyxplot |
| 72 |
+ $(LINK) $(LDFLAGS) $(PPL_OBJECTS_INSTALL) $(LIBS) -o $(LOCAL_BINDIR)/install/pyxplot |
| 73 |
|
| 74 |
# |
| 75 |
# Make the pyxplot_watch binaries |
| 76 |
@@ -135,15 +136,15 @@ |
| 77 |
|
| 78 |
$(LOCAL_BINDIR)/pyxplot_watch: $(PPLW_OBJECTS) |
| 79 |
mkdir -p $(LOCAL_BINDIR) |
| 80 |
- $(LINK) $(OPTIMISATION) $(PPLW_OBJECTS) -o $(LOCAL_BINDIR)/pyxplot_watch |
| 81 |
+ $(LINK) $(LDFLAGS) $(PPLW_OBJECTS) $(LIBS) -o $(LOCAL_BINDIR)/pyxplot_watch |
| 82 |
|
| 83 |
$(LOCAL_BINDIR)/debug/pyxplot_watch: $(PPLW_OBJECTS_DEBUG) |
| 84 |
mkdir -p $(LOCAL_BINDIR)/debug |
| 85 |
- $(LINK) $(OPTIMISATION) $(PPLW_OBJECTS_DEBUG) -o $(LOCAL_BINDIR)/debug/pyxplot_watch |
| 86 |
+ $(LINK) $(LDFLAGS) $(PPLW_OBJECTS_DEBUG) $(LIBS) -o $(LOCAL_BINDIR)/debug/pyxplot_watch |
| 87 |
|
| 88 |
$(LOCAL_BINDIR)/install/pyxplot_watch: $(PPLW_OBJECTS_INSTALL) |
| 89 |
mkdir -p $(LOCAL_BINDIR)/install |
| 90 |
- $(LINK) $(OPTIMISATION) $(PPLW_OBJECTS_INSTALL) -o $(LOCAL_BINDIR)/install/pyxplot_watch |
| 91 |
+ $(LINK) $(LDFLAGS) $(PPLW_OBJECTS_INSTALL) $(LIBS) -o $(LOCAL_BINDIR)/install/pyxplot_watch |
| 92 |
|
| 93 |
# |
| 94 |
# Make fits helper binaries |
| 95 |
@@ -151,11 +152,11 @@ |
| 96 |
|
| 97 |
$(LOCAL_BINDIR)/pyxplot_fitshelper: $(FITSHELP_OBJECTS) |
| 98 |
mkdir -p $(LOCAL_BINDIR) |
| 99 |
- $(LINK) $(LINK_FITSIO) $(OPTIMISATION) $(FITSHELP_OBJECTS) -o $(LOCAL_BINDIR)/pyxplot_fitshelper |
| 100 |
+ $(LINK) $(LDFLAGS) $(FITSHELP_OBJECTS) $(LINK_FITSIO) $(LIBS) -o $(LOCAL_BINDIR)/pyxplot_fitshelper |
| 101 |
|
| 102 |
$(LOCAL_BINDIR)/install/pyxplot_fitshelper: $(FITSHELP_OBJECTS_INSTALL) |
| 103 |
mkdir -p $(LOCAL_BINDIR)/install |
| 104 |
- $(LINK) $(LINK_FITSIO) $(OPTIMISATION) $(FITSHELP_OBJECTS_INSTALL) -o $(LOCAL_BINDIR)/install/pyxplot_fitshelper |
| 105 |
+ $(LINK) $(LDFLAGS) $(FITSHELP_OBJECTS_INSTALL) $(LINK_FITSIO) $(LIBS) -o $(LOCAL_BINDIR)/install/pyxplot_fitshelper |
| 106 |
|
| 107 |
# |
| 108 |
# Make time helper |
| 109 |
--- configure.orig 2010-08-24 22:29:10.000000000 +0100 |
| 110 |
+++ configure 2010-08-24 22:29:37.000000000 +0100 |
| 111 |
@@ -197,7 +197,7 @@ |
| 112 |
rm -f conf.* |
| 113 |
echo "YES" |
| 114 |
echo "HAVE_READLINE=-D HAVE_READLINE=1" >> Makefile |
| 115 |
- echo "LINK_READLINE=-ltermcap -lreadline" >> Makefile |
| 116 |
+ echo "LINK_READLINE=-lreadline" >> Makefile |
| 117 |
else |
| 118 |
rm -f conf.* |
| 119 |
echo "NO" |
Archives