This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "theslinux-buildsystem".
The branch, m17n-lib has been updated
via 1a55f35043c93abc0197d8edb2294e067c524533 (commit)
from 5aebaf61201cddaa8be58efdf540ae811028ed30 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 1a55f35043c93abc0197d8edb2294e067c524533
Author: Ky-Anh Huynh <ky...@theslinux.org>
Date: Sat Dec 6 18:29:04 2014 +0700
Fix --libdir for %lib32 support
-----------------------------------------------------------------------
Summary of changes:
m17n-lib/PKGBUILD | 9 ++++++---
m17n-lib/makepkg.conf%lib32 | 1 +
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/m17n-lib/PKGBUILD b/m17n-lib/PKGBUILD
index 791a499..d716b8a 100644
--- a/m17n-lib/PKGBUILD
+++ b/m17n-lib/PKGBUILD
@@ -9,7 +9,7 @@ url='http://www.nongnu.org/m17n/'
arch=('i686' 'x86_64')
license=('GPL')
depends=('libxft' 'm17n-db' 'fribidi' 'libxml2' 'gd' 'libotf')
-makedepends=("libthai${_FEATURE_LIB32:+%lib32}"
"libxt${_FEATURE_LIB32:+%lib32}")
+makedepends=("libthai${_FEATURE_LIB32:+%lib32}"
"${_FEATURE_LIB32:+lib32-}libxt")
# optdepends=('anthy: to use the anthy input method')
options=('!makeflags' '!libtool' '!emptydirs')
@@ -17,7 +17,9 @@
source=("http://download.savannah.gnu.org/releases/m17n/${pkgbase}-${pkgver}.tar
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr --enable-static=no
+ ./configure --prefix=/usr \
+ --libdir=/usr/lib${_FEATURE_LIB32} \
+ --enable-static=no
make
}
@@ -27,5 +29,6 @@ package() {
[[ -n "$_FEATURE_LIB32" ]] || return 0
rm -rf \
"${pkgdir}"/usr/bin \
- "${pkgdir}"/usr/include
+ "${pkgdir}"/usr/include \
+ "${pkgdir}"/usr/share
}
diff --git a/m17n-lib/makepkg.conf%lib32 b/m17n-lib/makepkg.conf%lib32
index f916899..f59100c 100644
--- a/m17n-lib/makepkg.conf%lib32
+++ b/m17n-lib/makepkg.conf%lib32
@@ -1,3 +1,4 @@
export CHOST="i686-pc-linux-gnu"
export CFLAGS="-m32 -march=i686 -mtune=generic -O2 -pipe
-fstack-protector-strong --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
export CXXFLAGS="${CFLAGS}"
+export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
hooks/post-receive
--
theslinux-buildsystem
--
To unsubscribe from the list phantom@lists.theslinux.org,
please send an email to ecar...@lists.theslinux.org with subject
unsubscribe phantom
To get basic commands to use Ecartis system, use subject 'help'.
