works on ia32 too

Signed-off-by: Gwenhael Le moine <gwenhael.le.moine@gmail.com>
This commit is contained in:
Gwenhael Le moine 2009-12-09 21:28:11 +07:00
parent 8a576eaebf
commit 6146b669e9
2 changed files with 34 additions and 13 deletions

View file

@ -60,9 +60,10 @@ if [ ! -e $CWD/$PRGNAM-$VERSION.tar.?z* ] ; then
git clone http://git.sv.gnu.org/r/emacs.git
fi
cd $REPOSITORY
git pull
( cd $REPOSITORY
[ -e Makefile ] && make distclean
git pull
)
#mkdir $PRGNAM-$VERSION
# FIXME: Hackish hack
cp -R $REPOSITORY $TMP/$PRGNAM-$VERSION
@ -95,6 +96,8 @@ $REPOSITORY/configure \
--with-x-toolkit=gtk \
--build=${ARCH}-slackware-linux
make bootstrap
make $NUMJOBS || make || exit 1
make install DESTDIR=$PKG || exit 1
@ -108,13 +111,31 @@ EMACS_VERSION=$(echo "$(basename $(ls $PKG/usr/bin/emacs-2*))" | grep -o "[0-9\.
XMODIFIERS= GTK_IM_MODULE= QT_IM_MODULE= /usr/bin/emacs-${EMACS_VERSION}-with-x11 "\$@"
EOF
chmod +x $PKG/usr/bin/emacs
chmod +x $PKG/usr/bin/emacs
)
# Also add a version of the binary that is not linked to X11:
cd $TMP
rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 || exit 1
if [ ! -e $CWD/$PRGNAM-$VERSION.tar.?z* ] ; then
# if [ ! -e $REPOSITORY ] ; then
# mkdir -p $(dirname $REPOSITORY)
# cd $(dirname $REPOSITORY)
# git clone http://git.sv.gnu.org/r/emacs.git
# fi
# ( cd $REPOSITORY
# [ -e Makefile ] && make distclean
# git pull
# )
# #mkdir $PRGNAM-$VERSION
# # FIXME: Hackish hack
cp -R $REPOSITORY $TMP/$PRGNAM-$VERSION
else
tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* || exit 1
REPOSITORY=.
fi
cd $PRGNAM-$VERSION || exit 1
chown -R root:root .
find . \
@ -125,7 +146,7 @@ find . \
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
$REPOSITORY/configure \
--prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var \

View file

@ -30,13 +30,13 @@ mkdir -p $PKG$PREFIX/libexec/$PRGNAM
chmod -x xdg-settings.orig
rm -fr etc usr opt
ln -s /usr/lib64/seamonkey/libssl3.so ./libssl3.so.1d
ln -s /usr/lib64/seamonkey/libnspr4.so ./libnspr4.so.0d
ln -s /usr/lib64/seamonkey/libplds4.so ./libplds4.so.0d
ln -s /usr/lib64/seamonkey/libsmime3.so ./libsmime3.so.1d
ln -s /usr/lib64/seamonkey/libnssutil3.so ./libnssutil3.so.1d
ln -s /usr/lib64/seamonkey/libplc4.so ./libplc4.so.0d
ln -s /usr/lib64/seamonkey/libnss3.so ./libnss3.so.1d
ln -s /usr/lib$( [ $ARCH = "x86_64" ] && echo 64 )/seamonkey/libssl3.so ./libssl3.so.1d
ln -s /usr/lib$( [ $ARCH = "x86_64" ] && echo 64 )/seamonkey/libnspr4.so ./libnspr4.so.0d
ln -s /usr/lib$( [ $ARCH = "x86_64" ] && echo 64 )/seamonkey/libplds4.so ./libplds4.so.0d
ln -s /usr/lib$( [ $ARCH = "x86_64" ] && echo 64 )/seamonkey/libsmime3.so ./libsmime3.so.1d
ln -s /usr/lib$( [ $ARCH = "x86_64" ] && echo 64 )/seamonkey/libnssutil3.so ./libnssutil3.so.1d
ln -s /usr/lib$( [ $ARCH = "x86_64" ] && echo 64 )/seamonkey/libplc4.so ./libplc4.so.0d
ln -s /usr/lib$( [ $ARCH = "x86_64" ] && echo 64 )/seamonkey/libnss3.so ./libnss3.so.1d
sed -i "s|/opt/google/chrome/|$PREFIX/libexec/$PRGNAM/|g" google-chrome.desktop
mkdir -p $PKG$PREFIX/share/applications