snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 2 Actions Activity

xbps-src: create a nspr-config wrapper to unbreak mozjs24 cross and others.

This commit is contained in:
Juan RP 2015-05-20 07:30:52 +02:00
parent 596f222f57
commit 58749959da
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/hooks/pre-configure/02-script-wrapper.sh
View File

@ -42,6 +42,7 @@ generic_wrapper3() {
cp ${XBPS_CROSS_BASE}/usr/bin/${wrapper} ${XBPS_WRAPPERDIR} cp ${XBPS_CROSS_BASE}/usr/bin/${wrapper} ${XBPS_WRAPPERDIR}
sed -e "s,/usr/include,${XBPS_CROSS_BASE}/usr/include,g" -i ${XBPS_WRAPPERDIR}/${wrapper} sed -e "s,/usr/include,${XBPS_CROSS_BASE}/usr/include,g" -i ${XBPS_WRAPPERDIR}/${wrapper}
sed -e "s,/usr/lib,${XBPS_CROSS_BASE}/usr/lib,g" -i ${XBPS_WRAPPERDIR}/${wrapper}
sed -e "s,^libdir=.*,libdir=${XBPS_CROSS_BASE}/usr/lib,g" -i ${XBPS_WRAPPERDIR}/${wrapper} sed -e "s,^libdir=.*,libdir=${XBPS_CROSS_BASE}/usr/lib,g" -i ${XBPS_WRAPPERDIR}/${wrapper}
sed -e "s,^prefix=.*,prefix=${XBPS_CROSS_BASE}/usr," -i ${XBPS_WRAPPERDIR}/${wrapper} sed -e "s,^prefix=.*,prefix=${XBPS_CROSS_BASE}/usr," -i ${XBPS_WRAPPERDIR}/${wrapper}
@ -120,6 +121,7 @@ hook() {
generic_wrapper3 ncurses5-config generic_wrapper3 ncurses5-config
generic_wrapper3 ncursesw5-config generic_wrapper3 ncursesw5-config
generic_wrapper3 libetpan-config generic_wrapper3 libetpan-config
generic_wrapper3 nspr-config
python_wrapper python-config 2.7 python_wrapper python-config 2.7
python_wrapper python3.4-config 3.4m python_wrapper python3.4-config 3.4m
} }

2
srcpkgs/mozjs24/template
View File

@ -25,8 +25,6 @@ do_configure() {
SHELL=/bin/bash ./configure --prefix=/usr --with-system-nspr \ SHELL=/bin/bash ./configure --prefix=/usr --with-system-nspr \
--enable-threadsafe ${_args} --enable-threadsafe ${_args}
sed -e 's,-L/usr/lib,,g' -i config/autoconf.mk
} }
mozjs24-devel_package() { mozjs24-devel_package() {