summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libraries/luaexpat/luaexpat.SlackBuild34
-rw-r--r--libraries/luaexpat/luaexpat.info8
2 files changed, 18 insertions, 24 deletions
diff --git a/libraries/luaexpat/luaexpat.SlackBuild b/libraries/luaexpat/luaexpat.SlackBuild
index bf0333b67b..431eaf5b76 100644
--- a/libraries/luaexpat/luaexpat.SlackBuild
+++ b/libraries/luaexpat/luaexpat.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for luaexpat
-# Copyright 2013, Andrew Tkalia <anddt@yandex.ru>, Ukraine, Kyiv
+# Copyright 2013-2014, Andrew Tkalia <anddt@yandex.ua>, Ukraine, Kyiv
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=luaexpat
-VERSION=${VERSION:-1.2.0}
+VERSION=${VERSION:-1.3.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -41,16 +41,16 @@ PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+ SLKCFLAGS="-march=i486 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+ SLKCFLAGS="-march=i686 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
+ SLKCFLAGS=""
LIBDIRSUFFIX="64"
else
- SLKCFLAGS="-O2"
+ SLKCFLAGS=""
LIBDIRSUFFIX=""
fi
@@ -65,25 +65,19 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-echo "Ignore This make warning"
-_CFLAGS="`make -nps |grep ^CFLAGS |sed "s,CFLAGS\ \=,,g"`"" ${SLKCFLAGS}"
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
make \
LUA_LIBDIR=" /usr/lib${LIBDIRSUFFIX}/lua/5.1" \
- LUA_DIR=" /usr/share/lua/5.1" \
- LUA_INC=" /usr/include" \
- EXPAT_INC=" /usr/include" \
- LUA_VERSION_NUM=" 501" \
- CFLAGS=" $_CFLAGS"
+ LUA_INC=" -I/usr/include" \
+ CFLAGS=" $SLKCFLAGS"
make install \
- LUA_LIBDIR=" $PKG/usr/lib${LIBDIRSUFFIX}/lua/5.1" \
- LUA_DIR=" $PKG/usr/share/lua/5.1" \
+ LUA_CDIR=" $PKG/usr/lib${LIBDIRSUFFIX}/lua/5.1" \
+ LUA_LDIR=" $PKG/usr/share/lua/5.1" \
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
diff --git a/libraries/luaexpat/luaexpat.info b/libraries/luaexpat/luaexpat.info
index 40bf947d9c..f2e30e0f3b 100644
--- a/libraries/luaexpat/luaexpat.info
+++ b/libraries/luaexpat/luaexpat.info
@@ -1,10 +1,10 @@
PRGNAM="luaexpat"
-VERSION="1.2.0"
+VERSION="1.3.0"
HOMEPAGE="http://matthewwild.co.uk/projects/luaexpat/"
-DOWNLOAD="http://matthewwild.co.uk/projects/luaexpat/luaexpat-1.2.0.tar.gz"
-MD5SUM="03efe50c7f30a34580701e6527d7bfee"
+DOWNLOAD="https://matthewwild.co.uk/projects/luaexpat/luaexpat-1.3.0.tar.gz"
+MD5SUM="3c20b5795e7107f847f8da844fbfe2da"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="lua"
MAINTAINER="Andrew Tkalia"
-EMAIL="anddt@yandex.ru"
+EMAIL="anddt@yandex.ua"