Commit 1c08303a authored by Aaron M. Ucko's avatar Aaron M. Ucko
Browse files

ncbi-tools6 6.1.20170106-6: d/rules: -rpath-link > LD_LIBRARY_PATH. 

debian/rules: Find indirectly needed libraries via -rpath-link rather
than LD_LIBRARY_PATH; the -rpath-link approach is generally saner, and
in particular has a decent shot at fully fixing cross-building.
parent 32046c75

debian/changelog

+8 −0
Original line number Diff line number Diff line 
ncbi-tools6 (6.1.20170106-6) unstable; urgency=medium



  * debian/rules: Find indirectly needed libraries via -rpath-link rather

    than LD_LIBRARY_PATH; the -rpath-link approach is generally saner, and

    in particular has a decent shot at fully fixing cross-building.



 -- Aaron M. Ucko <ucko@debian.org>  Thu, 27 Dec 2018 22:39:09 -0500



ncbi-tools6 (6.1.20170106-5) unstable; urgency=medium



  [ Andreas Tille ]

debian/rules

+1 −7
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ CFLAGS += -mieee 
endif

CFLAGS_PIC = $(filter-out -fPIE,$(CFLAGS)) -fPIC

LDFLAGS  := $(shell dpkg-buildflags --get LDFLAGS)

LDFLAGS1 := $(CFLAGS) $(LDFLAGS) -Wl,--as-needed

LDFLAGS1 := $(CFLAGS) $(LDFLAGS) -Wl,--as-needed -Wl,-rpath-link,../shlib



OGL_TARGETS = Cn3D

OGL_LIBVARS = LIB400=libvibrantOGL.a LIB3000=libncbicn3dOGL.a
@@ -46,12 +46,6 @@ MAKESHLIB = $(USESHLIB) NCBI_SHLIBS=shlib 
export NCBI_LBSM_SRC=ncbi_lbsmd_stub.c

export NCBI_LBSM_OBJ=ncbi_lbsmd_stub.o



ifeq ($(LD_LIBRARY_PATH),)

export LD_LIBRARY_PATH:=$(CURDIR)/shlib

else

export LD_LIBRARY_PATH:=$(CURDIR)/shlib:$(LD_LIBRARY_PATH)

endif



VIB = Psequin sbtedit udv ddv taxblast idfetch asn2gb tbl2asn gene2xml \

      entrez2 gbseqget asn2all asn2asn asn2fsa asn2xml asndisc asnmacro \

      asnval cleanasn insdseqget nps2gps spidey trna2sap trna2tbl \