diff options
| -rwxr-xr-x | net/im/silc-client/silc-client.SlackBuild | 2 | ||||
| -rwxr-xr-x | net/im/silc-client/silc-client.build | 6 | ||||
| -rwxr-xr-x | net/im/silc-plugin/silc-plugin.SlackBuild | 2 | ||||
| -rwxr-xr-x | net/im/silc-plugin/silc-plugin.build | 12 | ||||
| -rwxr-xr-x | patches/libwpd/libwpd.SlackBuild | 3 |
5 files changed, 18 insertions, 7 deletions
diff --git a/net/im/silc-client/silc-client.SlackBuild b/net/im/silc-client/silc-client.SlackBuild index 9f536554..4333d578 100755 --- a/net/im/silc-client/silc-client.SlackBuild +++ b/net/im/silc-client/silc-client.SlackBuild @@ -37,7 +37,7 @@ fi # default settings PACKAGE="silc-client" -VERSION=${VERSION:=1.1-beta5} +VERSION=${VERSION:=1.1-beta6} ARCH="${ARCH:=i486}" BUILD=${BUILD:=1rha} SRC_DIR=${SRC:=$CWD} diff --git a/net/im/silc-client/silc-client.build b/net/im/silc-client/silc-client.build index 59d76cf1..ab41f0ad 100755 --- a/net/im/silc-client/silc-client.build +++ b/net/im/silc-client/silc-client.build @@ -44,14 +44,16 @@ fi # default settings PACKAGE="silc-client" ARCH=${ARCH:=i486} -VERSION=${VERSION:=1.1-beta5} +VERSION=${VERSION:=1.1-beta6} BUILD=${BUILD:=1rha} SRC_DIR=${SRC:=$CWD} TMP=${TMP:=/tmp} REPOS=${REPOS:=$TMP} if [ "$ARCH" == "x86_64" ]; then + export CFLAGS=-fPIC LIBDIR=/usr/lib64 + #CONF_OPTIONS="--disable-asm" CONF_OPTIONS="--with-pic" else LIBDIR=/usr/lib @@ -91,7 +93,7 @@ if [ -f "$CWD/$PACKAGE-$VERSION.diff" ]; then patch -p1 < $CWD/$PACKAGE-$VERSION.diff fi -./configure --prefix=/usr --sysconfdir=/etc --libdir=$LIBDIR --with-docdir=/usr/doc/$PACKAGE-$PKG_VERSION $CONF_OPTIONS +./configure --prefix=/usr --sysconfdir=/etc --libdir=$LIBDIR --with-docdir=/usr/doc/$PACKAGE-$PKG_VERSION "$CONF_OPTIONS" make || exit 32 make install diff --git a/net/im/silc-plugin/silc-plugin.SlackBuild b/net/im/silc-plugin/silc-plugin.SlackBuild index 12ffdc49..ddcb8fba 100755 --- a/net/im/silc-plugin/silc-plugin.SlackBuild +++ b/net/im/silc-plugin/silc-plugin.SlackBuild @@ -37,7 +37,7 @@ fi # default settings PACKAGE="silc-plugin" -VERSION=${VERSION:=1.1-beta5} +VERSION=${VERSION:=1.1-beta6} ARCH="${ARCH:=i486}" BUILD=${BUILD:=1rha} SRC_DIR=${SRC:=$CWD} diff --git a/net/im/silc-plugin/silc-plugin.build b/net/im/silc-plugin/silc-plugin.build index 0662708c..f0bc7aa7 100755 --- a/net/im/silc-plugin/silc-plugin.build +++ b/net/im/silc-plugin/silc-plugin.build @@ -44,14 +44,19 @@ fi # default settings PACKAGE="silc-plugin" ARCH=${ARCH:=i486} -VERSION=${VERSION:=1.1-beta5} +VERSION=${VERSION:=1.1-beta6} BUILD=${BUILD:=1rha} SRC_DIR=${SRC:=$CWD} TMP=${TMP:=/tmp} REPOS=${REPOS:=$TMP} if [ "$ARCH" == "x86_64" ]; then + export CFLAGS=-fPIC LIBDIR=/usr/lib64 + #CONF_OPTIONS="--disable-asm" + #CONF_OPTIONS="--with-pic --disable-asm --with-pthreads=no" + export LDFLAGS="-L/lib64 -L/usr/lib64" + CONF_OPTIONS="--with-pic --with-pthreads=no --with-iconv=no" else LIBDIR=/usr/lib fi @@ -84,8 +89,9 @@ if [ -f "$CWD/$PACKAGE-$VERSION.diff" ]; then patch -p1 < $CWD/$PACKAGE-$VERSION.diff fi -./configure --prefix=/usr --sysconfdir=/etc --libdir=$LIBDIR --with-docdir=/usr/doc/$PACKAGE-$PKG_VERSION \ - --enable-silc-plugin --without-silc-includes --with-simdir=$LIBDIR/irssi +./configure --prefix=/usr --sysconfdir=/etc --libdir=$LIBDIR $CONF_OPTIONS \ + --with-docdir=/usr/doc/$PACKAGE-$PKG_VERSION \ + --enable-silc-plugin --without-silc-includes --with-simdir=$LIBDIR/irssi/modules make || exit 32 make install diff --git a/patches/libwpd/libwpd.SlackBuild b/patches/libwpd/libwpd.SlackBuild index 2884ff41..7dd789ab 100755 --- a/patches/libwpd/libwpd.SlackBuild +++ b/patches/libwpd/libwpd.SlackBuild @@ -62,6 +62,9 @@ PACKAGE_EXT="gz" SRC="$PACKAGE-$VERSION.tar.$PACKAGE_EXT" URL="http://easynews.dl.sourceforge.net/sourceforge/libwpd/$SRC" +SRC_DIR="$SRC_DIR/$PACKAGE" +mkdir -p $SRC_DIR + if [ "$RTOOL" == "wget" ] && [ ! -f "$SRC_DIR/$SRC" ]; then wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET fi |