[patch] patch to dev-libs/ntl-6.1.0 to produce a working ebuild for dev-libs/ntl-6.2.1

ebuild.patch (text/plain), 2.52 KB, created by François Bissey on 2014-09-15 22:11:52 UTC

--- /usr/portage/dev-libs/ntl/ntl-6.1.0.ebuild	2014-06-17 09:54:20.000000000 +1200
+++ ntl-6.2.1.ebuild	2014-09-16 10:08:19.897609743 +1200
@@ -22,54 +22,47 @@
 S="${WORKDIR}/${P}/src"
 
 src_prepare() {
-	# fix parallel make
-	sed -i -e "s/make/make ${MAKEOPTS}/g" WizardAux || die
+	# Add controls to build static library or not. Sanitize the use of make
+	# and split the install target for the documentation.
+	epatch "${FILESDIR}"/${PN}-6.2.1-static_and_sanity.patch
+	# multilib fix
+	sed -i -e "s:\$(PREFIX)/lib:\$(PREFIX)/$(get_libdir):g" DoConfig
 	cd ..
 	# enable compatibility with singular
-	epatch "$FILESDIR/${PN}-6.0.0-singular.patch"
+	epatch "${FILESDIR}"/${PN}-6.0.0-singular.patch
 	# implement a call back framework (submitted upstream)
-	epatch "$FILESDIR/${PN}-6.0.0-sage-tools.patch"
-	# sanitize the makefile and allow the building of shared library
-	epatch "$FILESDIR/${PN}-5.5.2-shared-r1.patch"
+	epatch "${FILESDIR}"/${PN}-6.0.0-sage-tools.patch
 	replace-flags -O[3-9] -O2
 }
 
 src_configure() {
+	# control the building of the static library
+	local BUILDSTATIC="off"
+	use static-libs && BUILDSTATIC="on"
+
 	perl DoConfig \
 		PREFIX="${EPREFIX}"/usr \
-		CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" \
-		CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
+		CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" \
+		CXX="$(tc-getCXX)" SHARED=on \
 		AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" \
 		NTL_STD_CXX=on NTL_GMP_LIP=on NTL_GF2X_LIB=on \
+		STATIC="${BUILDSTATIC}" \
 		|| die "DoConfig failed"
 }
 
 src_compile() {
+	tc-export CC
 	# split the targets to allow parallel make to run properly
 	emake setup1 setup2 || die "emake setup failed"
 	emake setup3 || die "emake setup failed"
 	sh Wizard on || die "Tuning wizard failed"
-	if use static-libs || use test; then
-		emake ntl.a  || die "emake static failed"
-	fi
-	local trg=so
-	[[ ${CHOST} == *-darwin* ]] && trg=dylib
-	emake shared${trg} || die "emake shared failed"
+	# this target now can build both shared and static libraries
+	emake ntl.a  || die "emake failed to build the libraries"
 }
 
 src_install() {
-	if use static-libs; then
-		newlib.a ntl.a libntl.a || die "installation of static library failed"
-	fi
-	dolib.so lib*$(get_libname) || die "installation of shared library failed"
-
-	cd ..
-	insinto /usr/include
-	doins -r include/NTL || die "installation of the headers failed"
-
-	dodoc README
-	if use doc ; then
-		dodoc doc/*.txt || die
-		dohtml doc/* || die
+	emake PREFIX="${ED}usr" install
+	if use doc; then
+		emake PREFIX="${ED}usr" install-doc
 	fi
 }