| 1 |
markusle 08/06/30 12:36:02 |
| 2 |
|
| 3 |
Added: xephem-3.7.3-use-system-lib.patch |
| 4 |
Removed: xephem-3.7.3-link-motif.patch |
| 5 |
Log: |
| 6 |
Added patch to make sure and explicit that only system libs are being used (see bug #229885). |
| 7 |
(Portage version: 2.2_rc1/cvs/Linux 2.6.25-SENTINEL-3 i686) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 sci-astronomy/xephem/files/xephem-3.7.3-use-system-lib.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-astronomy/xephem/files/xephem-3.7.3-use-system-lib.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-astronomy/xephem/files/xephem-3.7.3-use-system-lib.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: xephem-3.7.3-use-system-lib.patch |
| 16 |
=================================================================== |
| 17 |
diff -Naur xephem-3.7.3/GUI/xephem/Makefile xephem-3.7.3.new/GUI/xephem/Makefile |
| 18 |
--- xephem-3.7.3/GUI/xephem/Makefile 2006-05-13 19:06:06.000000000 -0400 |
| 19 |
+++ xephem-3.7.3.new/GUI/xephem/Makefile 2008-06-30 06:38:50.000000000 -0400 |
| 20 |
@@ -10,9 +10,9 @@ |
| 21 |
# back here and compile and link all the *.c files into one executable, xephem. |
| 22 |
|
| 23 |
# -I and -L flags to find required supporting XEphem libraries |
| 24 |
-LIBINC = -I../../libastro -I../../libip -I../../liblilxml -I../../libjpegd -I../../libpng -I../../libz |
| 25 |
-LIBLNK = -L../../libastro -L../../libip -L../../liblilxml -L../../libjpegd -L../../libpng -L../../libz |
| 26 |
-LIBLIB = -lastro -lip -llilxml -ljpegd -lpng -lz |
| 27 |
+LIBINC = -I../../libastro -I../../libip -I../../liblilxml |
| 28 |
+LIBLNK = -L../../libastro -L../../libip -L../../liblilxml |
| 29 |
+LIBLIB = -lastro -lip -llilxml -ljpeg -lpng -lz |
| 30 |
|
| 31 |
# MOTIFI is the directory containing the Xm directory of include files. |
| 32 |
# MOTIFL is the directory containing the libXm.a library. |
| 33 |
@@ -34,7 +34,7 @@ |
| 34 |
CLDFLAGS = -g |
| 35 |
CFLAGS = $(LIBINC) $(CLDFLAGS) -O2 -Wall -I$(MOTIFI) -I/usr/X11R6/include |
| 36 |
LDFLAGS = $(LIBLNK) $(CLDFLAGS) -L$(MOTIFL) -L/usr/X11R6/lib |
| 37 |
-XLIBS = $(MOTIFL)/libXm.a -lXp -lXt -lXext -lXmu -lX11 |
| 38 |
+XLIBS = -lXm -lXp -lXt -lXext -lXmu -lX11 |
| 39 |
LIBS = $(XLIBS) $(LIBLIB) -lm |
| 40 |
|
| 41 |
# for ppc Apple OS X to make universal (i386 and ppc binary), requires |
| 42 |
@@ -187,10 +187,7 @@ |
| 43 |
libs: |
| 44 |
cd ../../libastro; make |
| 45 |
cd ../../libip; make |
| 46 |
- cd ../../libjpegd; make |
| 47 |
cd ../../liblilxml; make |
| 48 |
- cd ../../libpng; make |
| 49 |
- cd ../../libz; make |
| 50 |
|
| 51 |
clean: |
| 52 |
touch x.o |
| 53 |
|
| 54 |
|
| 55 |
|
| 56 |
-- |
| 57 |
gentoo-commits@l.g.o mailing list |
Archives