diff options
| author | Erik Falor <ewfalor@gmail.com> | 2014-07-17 07:43:54 +0700 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2014-07-17 07:43:54 +0700 |
| commit | 7c7e96f9aba17fc8bbf805131d799eaa9277b974 (patch) | |
| tree | 3095c0639e56b594fdfd494bdbbb57507240235e | |
| parent | 2f5155a1c3d9b40698ef43734e6fb4fcf38ea084 (diff) | |
| download | slackbuilds-7c7e96f9aba17fc8bbf805131d799eaa9277b974.tar.gz | |
system/qingy: Script cleanup + fix multilib issue.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
| -rw-r--r-- | system/qingy/qingy.SlackBuild | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/system/qingy/qingy.SlackBuild b/system/qingy/qingy.SlackBuild index 04f457ba28..d7895d2e5f 100644 --- a/system/qingy/qingy.SlackBuild +++ b/system/qingy/qingy.SlackBuild @@ -24,7 +24,7 @@ PRGNAM=qingy VERSION=${VERSION:-1.0.0} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -49,6 +49,7 @@ elif [ "$ARCH" = "i686" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" + SLKLDFLAGS="-L/usr/X11R6/lib64" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" @@ -64,13 +65,14 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 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 {} \; + \( -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 {} \; CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ +LDFLAGS="$SLKLDFLAGS" \ ./configure \ --prefix=/usr \ --exec-prefix=/ \ @@ -81,7 +83,8 @@ CXXFLAGS="$SLKCFLAGS" \ --infodir=/usr/info \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --build=$ARCH-slackware-linux \ - --disable-screen-savers + --disable-screen-savers \ + --enable-static=no make make install-strip DESTDIR=$PKG @@ -90,9 +93,7 @@ rm -f $PKG/usr/info/dir gzip -9 $PKG/usr/info/*.info* mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - AUTHORS COPYING INSTALL NEWS README THANKS TODO \ - $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS COPYING INSTALL NEWS README THANKS TODO $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install |