diff options
author | 2022-03-01 16:05:00 +0100 | |
---|---|---|
committer | 2022-03-01 16:05:29 +0100 | |
commit | b6e954e30d906676f203c02b983e4367dd602209 (patch) | |
tree | 751cc2bba7f061f915bd118ed87762e0b089c952 /sci-astronomy/xephem/files | |
parent | media-gfx/darktable: do not set CMAKE_BUILD_TYPE (diff) | |
download | gentoo-b6e954e30d906676f203c02b983e4367dd602209.tar.gz gentoo-b6e954e30d906676f203c02b983e4367dd602209.tar.bz2 gentoo-b6e954e30d906676f203c02b983e4367dd602209.zip |
sci-astronomy/xephem: add version 4.1.0
This version adds ssl support
Closes: https://bugs.gentoo.org/776166
Closes: https://bugs.gentoo.org/774933
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan@gentoo.org>
Diffstat (limited to 'sci-astronomy/xephem/files')
-rw-r--r-- | sci-astronomy/xephem/files/xephem-4.1.0-respect_env_vars.patch | 128 |
1 files changed, 128 insertions, 0 deletions
diff --git a/sci-astronomy/xephem/files/xephem-4.1.0-respect_env_vars.patch b/sci-astronomy/xephem/files/xephem-4.1.0-respect_env_vars.patch new file mode 100644 index 000000000000..0f08e4380c30 --- /dev/null +++ b/sci-astronomy/xephem/files/xephem-4.1.0-respect_env_vars.patch @@ -0,0 +1,128 @@ +diff --git a/GUI/xephem/Makefile b/GUI/xephem/Makefile +index dd653c7..32966ee 100644 +--- a/GUI/xephem/Makefile ++++ b/GUI/xephem/Makefile +@@ -9,9 +9,9 @@ + # one executable, xephem. + + # These -I and -L flags point to the supporting XEphem libraries +-LIBINC = -I../../libastro -I../../libip -I../../liblilxml -I../../libjpegd -I../../libpng -I../../libz +-LIBLNK = -L../../libastro -L../../libip -L../../liblilxml -L../../libjpegd -L../../libpng -L../../libz +-LIBLIB = -lastro -lip -llilxml -ljpegd -lpng -lz ++LIBINC = -I../../libastro -I../libastro -I../../libip -I../libip -I../../liblilxml -I../liblilxml ++LIBLNK = -L../../libastro -L../libastro -L../../libip -L../libip -L../../liblilxml -L../liblilxml ++LIBLIB = -lastro -lip -llilxml -ljpeg -lpng -lz + + # MOTIFI is the directory containing the Xm directory of include files. + # MOTIFL is the directory containing the libXm.a library. +@@ -29,12 +29,9 @@ MOTIFL = /usr/lib + endif + + # for linux and Apple OS X +-CC = gcc +-CLDFLAGS = -g +-CFLAGS = $(LIBINC) $(CLDFLAGS) -O2 -Wall -I$(MOTIFI) -I/opt/X11/include +-LDFLAGS = $(LIBLNK) $(CLDFLAGS) -L$(MOTIFL) -L/opt/X11/lib + XLIBS = -lXm -lXt -lXext -lXmu -lX11 +-LIBS = $(XLIBS) $(LIBLIB) -lm -lssl ++CFLAGS := $(LIBINC) $(CFLAGS) ++LIBS = $(LIBLNK) $(XLIBS) $(LIBLIB) -lm -lssl + + # static linking on Apple using X11 libs from ports + # CC = gcc +@@ -194,12 +191,9 @@ xephem.1: xephem.man + nroff -man $? > $@ + + libs: +- cd ../../libastro; make +- cd ../../libip; make +- cd ../../libjpegd; make +- cd ../../liblilxml; make +- cd ../../libpng; make +- cd ../../libz; make ++ $(MAKE) -C ../../libastro ++ $(MAKE) -C ../../libip ++ $(MAKE) -C ../../liblilxml + + clean: + rm -fr *.o ../../lib*/*.[ao] +diff --git a/libastro/Makefile b/libastro/Makefile +index 0a8ecb6..a640c95 100644 +--- a/libastro/Makefile ++++ b/libastro/Makefile +@@ -4,8 +4,6 @@ + # compiler and flags + + # gcc +-CC = gcc +-CFLAGS= -O2 -Wall + + # macosx universal binary + # CFLAGS= -O2 -Wall -arch i386 -arch ppc +@@ -83,11 +81,11 @@ OBJS = \ + vsop87_data.o + + libastro.a: $(HS) $(OBJS) +- ar rv $@ $(OBJS) +- ranlib $@ ++ $(AR) rv $@ $(OBJS) ++ $(RANLIB) $@ + + libastro.so: $(HS) $(OBJS) +- $(CC) -shared -o $@ $(OBJS) ++ $(CC) $(LDFLAGS) -shared -o $@ $(OBJS) + + clobber: + rm -f *.o libastro.a +diff --git a/libip/Makefile b/libip/Makefile +index 5c36ac8..f093d6f 100644 +--- a/libip/Makefile ++++ b/libip/Makefile +@@ -2,8 +2,6 @@ + # (C) 2001 Elwood Charles Downey + + # gcc +-CC = gcc +-CFLAGS= -I../libastro -O2 -Wall + + # macosx universal binary + # CFLAGS= -I../libastro -O2 -Wall -arch i386 -arch ppc +@@ -36,11 +34,11 @@ OBJS = \ + HS = ip.h fsmatch.h + + libip.a: $(HS) $(OBJS) +- ar rv $@ $(OBJS) +- ranlib $@ ++ $(AR) rv $@ $(OBJS) ++ $(RANLIB) $@ + + libip.so: $(OBJS) +- gcc -shared -o $@ $(OBJS) ++ $(CC) $(LDFLAGS) -shared -o $@ $(OBJS) + + clobber: + rm -f *.o libip.a +diff --git a/liblilxml/Makefile b/liblilxml/Makefile +index 2e73761..c75651b 100644 +--- a/liblilxml/Makefile ++++ b/liblilxml/Makefile +@@ -4,8 +4,6 @@ + # compiler and flags + + # gcc +-CC = gcc +-CFLAGS= -O2 -Wall + + # macosx universal binary + # CFLAGS= -O2 -Wall -arch i386 -arch ppc +@@ -27,8 +25,8 @@ HS = lilxml.h + OBJS = lilxml.o base64.o + + liblilxml.a: $(HS) $(OBJS) +- ar r $@ $(OBJS) +- ranlib $@ ++ $(AR) r $@ $(OBJS) ++ $(RANLIB) $@ + + liltest: liltest.o liblilxml.a + $(CC) $(LDFLAGS) -o liltest liltest.o liblilxml.a |