Date: Sunday, December 12, 2010 @ 12:43:16
Author: andyrtr
Revision: 102883
upgpkg: openoffice-base-beta 3.3.0_ooo330_m17-1
new upstream release OOO330_m17; finally managed to get it built again; use
autoconf instead of autoreconf to fix configure's pkg-config detections
Modified:
openoffice-base-beta/trunk/PKGBUILD
----------+
PKGBUILD | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-12-12 17:17:00 UTC (rev 102882)
+++ PKGBUILD 2010-12-12 17:43:16 UTC (rev 102883)
@@ -222,8 +222,8 @@
[ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh
# some speedups
-# export SMP="5"
- export SMP="1"
+ export SMP="6"
+# export SMP="1"
MAXMODULESFLAG="-P${SMP}"
MAXPROCESSESFLAG="-P${SMP}"
export nodep=true
@@ -257,7 +257,7 @@
# fix to build with SUN jdk/jre and OpenJDK
# http://qa.openoffice.org/issues/show_bug.cgi?id=74749
sed -i "s:lib64\/libjpeg.so:lib\/libjpeg.so:g"
${srcdir}/${_OO_milestone}/solenv/inc/libs.mk
- else EXTRAOPTS="--with-stlport --without-system-cppunit"
+ else EXTRAOPTS="--with-stlport --without-system-cppunit"
# http://hg.services.openoffice.org/cws/sb122/raw-rev/f77b0e62cc92
cp -v ${srcdir}/cppunit_gcc45.diff
${srcdir}/${_OO_milestone}/cppunit/ldflags.patch
fi
@@ -276,7 +276,10 @@
export PYTHON=python2
# Need to recreate the configure script because of patches
- autoreconf -v
+ #autoreconf -v
+ # fix configure not detecting .pc files properly
+# export PKG_CONFIG=/usr/bin/pkg-config
+ autoconf #
./configure --with-build-version="${pkgver} ArchLinux build-${pkgrel}
(${_OO_milestone})" \
--with-vendor="ArchLinux"\
