jlec 15/03/28 17:35:00 Added: embassy-cbstools-1.0.0.650_fix-build-system.patch Log: Import latest changes from science overlay, thanks Ted Tanberry for the work; fixes #335603 (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)
Revision Changes Path 1.1 sci-biology/embassy-cbstools/files/embassy-cbstools-1.0.0.650_fix-build-system.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-biology/embassy-cbstools/files/embassy-cbstools-1.0.0.650_fix-build-system.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-biology/embassy-cbstools/files/embassy-cbstools-1.0.0.650_fix-build-system.patch?rev=1.1&content-type=text/plain Index: embassy-cbstools-1.0.0.650_fix-build-system.patch =================================================================== --- CBSTOOLS-1.0.0.650/configure.ac +++ CBSTOOLS-1.0.0.650/configure.ac @@ -635,33 +635,6 @@ -dnl PCRE library definitions - see the MAJOR and MINOR values -dnl to see which version's configure.in these lines come from - -dnl Provide the current PCRE version information. Do not use numbers -dnl with leading zeros for the minor version, as they end up in a C -dnl macro, and may be treated as octal constants. Stick to single -dnl digits for minor numbers less than 10. There are unlikely to be -dnl that many releases anyway. - -PCRE_MAJOR="7" -PCRE_MINOR="9" -PCRE_DATE="11-Apr-2009" -PCRE_VERSION="${PCRE_MAJOR}.${PCRE_MINOR}" - -dnl Default values for miscellaneous macros - -POSIX_MALLOC_THRESHOLD="-DPOSIX_MALLOC_THRESHOLD=10" - -dnl Provide versioning information for libtool shared libraries that -dnl are built by default on Unix systems. - -PCRE_LIB_VERSION="0:1:0" -PCRE_POSIXLIB_VERSION="0:0:0" - - - - dnl FIXME: This does no longer seem required with Autoconf 2.67? dnl Intel MacOSX 10.6 puts X11 in a non-standard place dnl AS_IF([test "x${with_x}" != "xno"], @@ -737,21 +710,6 @@ -dnl "Export" these variables for PCRE - -AC_SUBST([HAVE_MEMMOVE]) -AC_SUBST([HAVE_STRERROR]) -AC_SUBST([PCRE_MAJOR]) -AC_SUBST([PCRE_MINOR]) -AC_SUBST([PCRE_DATE]) -AC_SUBST([PCRE_VERSION]) -AC_SUBST([PCRE_LIB_VERSION]) -AC_SUBST([PCRE_POSIXLIB_VERSION]) -AC_SUBST([POSIX_MALLOC_THRESHOLD]) - - - - dnl Test if --enable-localforce given locallink="no" embprefix="/usr/local" @@ -874,6 +832,11 @@ AM_CONDITIONAL([ESYSTEMLIBS], [test "x${enable_systemlibs}" = "xyes"]) +AS_IF([test "x${enable_systemlibs}" = "xyes"], +[ +dnl using system libraries + PKG_CHECK_MODULES([PLPLOT], [plplotd]) +]) # Enable the purify tool: --enable-purify, sets CC and LIBTOOL --- CBSTOOLS-1.0.0.650/src/Makefile.am +++ CBSTOOLS-1.0.0.650/src/Makefile.am @@ -19,9 +19,7 @@ -I../../../ajax/ensembl -I../../../ajax/ajaxdb \ -I../../../ajax/acd -I../../../plplot else -AM_CPPFLAGS = -I${embprefix}/include -I${embprefix}/include/eplplot \ - $(NLINCLUDES) \ - -I${embprefix}/include/epcre +AM_CPPFLAGS = -I${embprefix}/include $(NLINCLUDES) $(PLPLOT_CFLAGS) endif if ISSHARED @@ -65,5 +63,5 @@ $(XLIB) else LDADD = -L${embprefix}/lib -lnucleus -lacd -lajaxdb -lensembl -lajaxg \ - -lajax -lepcre $(NLADD) -leplplot $(XLIB) + -lajax $(NLADD) $(XLIB) endif --- CBSTOOLS-1.0.0.650/emboss_acd/Makefile.am +++ CBSTOOLS-1.0.0.650/emboss_acd/Makefile.am @@ -1,3 +1,3 @@ -pkgdata_DATA = *.acd +pkgdata_DATA = $(srcdir)/*.acd pkgdatadir=$(prefix)/share/EMBOSS/acd
