mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-22 11:40:06 +02:00
libxml2: Fix develop/lib paths
* Replace $libDir by $developLibDir in xml2Conf.sh and xml2-config. * Make with multiple jobs.
This commit is contained in:
@@ -4,7 +4,7 @@ LICENSE="MIT"
|
||||
COPYRIGHT="1998-2003 Daniel Veillard. All Rights Reserved."
|
||||
SRC_URI="ftp://xmlsoft.org/libxml2/libxml2-2.8.0.tar.gz"
|
||||
CHECKSUM_MD5="c62106f02ee00b6437f0fb9d370c1093"
|
||||
REVISION="1"
|
||||
REVISION="2"
|
||||
ARCHITECTURES="x86_gcc2 ?x86"
|
||||
|
||||
PATCHES="libxml2-2.8.0.patch"
|
||||
@@ -54,7 +54,7 @@ BUILD()
|
||||
runConfigure ./configure LDFLAGS="-lnetwork" \
|
||||
--with-html-dir=$docDir/html \
|
||||
--with-html-subdir=""
|
||||
make
|
||||
make $jobArgs
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
@@ -65,6 +65,7 @@ INSTALL()
|
||||
prepareInstalledDevelLibs libxml2
|
||||
fixPkgconfig
|
||||
mv $libDir/xml2Conf.sh $developLibDir/
|
||||
fixDevelopLibDirReferences $developLibDir/xml2Conf.sh $binDir/xml2-config
|
||||
}
|
||||
|
||||
TEST()
|
||||
|
||||
@@ -24,3 +24,26 @@ diff -ur libxml2-2.8.0.orig/Makefile.am libxml2-2.8.0/Makefile.am
|
||||
EXAMPLES_DIR=$(BASE_DIR)/$(DOC_MODULE)/examples
|
||||
|
||||
install-data-local:
|
||||
diff -ur orig/libxml2-2.8.0/xml2-config.in libxml2-2.8.0/xml2-config.in
|
||||
--- orig/libxml2-2.8.0/xml2-config.in 2009-07-30 17:24:35.050855936 +0200
|
||||
+++ libxml2-2.8.0/xml2-config.in 2013-04-30 18:29:36.158072832 +0200
|
||||
@@ -40,8 +40,8 @@
|
||||
case "$1" in
|
||||
--prefix=*)
|
||||
prefix=$optarg
|
||||
- includedir=$prefix/include
|
||||
- libdir=$prefix/lib
|
||||
+ includedir=$prefix/develop/headers
|
||||
+ libdir=$prefix/develop/lib
|
||||
;;
|
||||
|
||||
--prefix)
|
||||
@@ -50,7 +50,7 @@
|
||||
|
||||
--exec-prefix=*)
|
||||
exec_prefix=$optarg
|
||||
- libdir=$exec_prefix/lib
|
||||
+ libdir=$exec_prefix/develop/lib
|
||||
;;
|
||||
|
||||
--exec-prefix)
|
||||
|
||||
Reference in New Issue
Block a user