nspr: Build in CARCH build directories
This commit is contained in:
@@ -42,16 +42,15 @@ prepare() {
|
||||
}
|
||||
|
||||
build() {
|
||||
#mkdir -p ${srcdir}/build-${MINGW_CHOST}
|
||||
#cd ${srcdir}/build-${MINGW_CHOST}
|
||||
cd ${srcdir}/${_realname}-${pkgver}
|
||||
[[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH}
|
||||
mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH}
|
||||
if [ "$CARCH" = "x86_64" ]; then
|
||||
_confflags="--enable-64bit"
|
||||
else
|
||||
_confflags=""
|
||||
fi
|
||||
|
||||
./nspr/configure \
|
||||
"${srcdir}"/${_realname}-${pkgver}/nspr/configure \
|
||||
--prefix=${MINGW_PREFIX} \
|
||||
--build=${MINGW_CHOST} \
|
||||
--host=${MINGW_CHOST} \
|
||||
@@ -65,8 +64,8 @@ build() {
|
||||
}
|
||||
|
||||
package() {
|
||||
cd ${srcdir}/${_realname}-${pkgver}
|
||||
PATH="$PATH:${srcdir}/${_realname}-${pkgver}" make DESTDIR="$pkgdir" install
|
||||
cd "${srcdir}"/build-${CARCH}
|
||||
PATH="$PATH:${srcdir}/moztools/bin:$PWD" make DESTDIR="$pkgdir" install
|
||||
|
||||
mv ${pkgdir}${MINGW_PREFIX}/lib/*.dll ${pkgdir}${MINGW_PREFIX}/bin/
|
||||
|
||||
@@ -74,5 +73,5 @@ package() {
|
||||
rm -r ${pkgdir}${MINGW_PREFIX}/bin/{compile-et.pl,prerr.properties} \
|
||||
${pkgdir}${MINGW_PREFIX}/include/nspr/md
|
||||
|
||||
install -Dm644 nspr/LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"
|
||||
install -Dm644 "${srcdir}"/${_realname}-${pkgver}/nspr/LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user