diff options
| author | Larry Hajali <larryhaja[at]gmail[dot]com> | 2010-05-13 00:36:43 +0200 |
|---|---|---|
| committer | David Somero <xgizzmo@slackbuilds.org> | 2010-05-13 00:36:43 +0200 |
| commit | acc73f29f6d4c728d67f20f37e72ab66537b74f8 (patch) | |
| tree | 262dd30c07eee3ef645e866d87a3a1d49f5f4ce4 /network/hydra/hydra.SlackBuild | |
| parent | 091531ddf4f532a5a7263f2982945e4141be7df7 (diff) | |
network/hydra: Updated for version 5.4
Diffstat (limited to 'network/hydra/hydra.SlackBuild')
| -rw-r--r-- | network/hydra/hydra.SlackBuild | 46 |
1 files changed, 27 insertions, 19 deletions
diff --git a/network/hydra/hydra.SlackBuild b/network/hydra/hydra.SlackBuild index e6dbd6bb87b9c..4bcccd7da408c 100644 --- a/network/hydra/hydra.SlackBuild +++ b/network/hydra/hydra.SlackBuild @@ -5,7 +5,7 @@ PRGNAM=hydra VERSION=${VERSION:-5.4} ARCH=${ARCH:-i486} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} CWD=$(pwd) @@ -13,14 +13,15 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -DOCS="CHANGES LICENSE* README TODO hydra-gtk/COPYING hydra-gtk/INSTALL" - if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" fi set -e @@ -41,30 +42,35 @@ find . \ # Removes a glibc error when http-form option is used # Patch from gentoo: http://bugs.gentoo.org/show_bug.cgi?id=209116 -patch -p0 < $CWD/hydra-http-form.patch +patch -p0 < $CWD/patches/hydra-http-form.patch + +# Add ability to specify additional libdir locations to search, and also +# merge in some precursors for the next patch +patch -p1 < $CWD/patches/hydra-5.4-configure_fixups.patch + +# Patch needed to compile against new versions of libssh. +patch -p1 < $CWD/patches/hydra-5.4-libssh-0.4.patch -# Patches needed to compile against new versions of -# apr, apr-util, and libssh -patch -p0 < $CWD/configure.patch -patch -p1 < $CWD/hydra-libssh-0.2.patch +# Fixup Makefile.am before configuring +patch -p1 < $CWD/patches/hydra-5.4-Makefile_am.patch # sed statements cleans up some code for the gui -sed -i "s:\/foo\/bar\/protected.html:\/:" hydra-gtk/xhydra.glade -sed -i "s:\/foo\/bar\/protected.html:\/:" hydra-gtk/src/interface.c +sed -i 's|/foo/bar/protected.html|/|' hydra-gtk/xhydra.glade +sed -i 's|/foo/bar/protected.html|/|' hydra-gtk/src/interface.c -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +EXTRA_LIBDIRS="/lib64 /usr/lib64" \ ./configure \ --enable-pw-inspector=yes \ - --enable-static=no \ - --build=$ARCH-slackware-linux + --enable-static=no -make +make EXTRA_CFLAGS="$SLKCFLAGS" make install PREFIX=$PKG DIR=/usr/bin ( cd $PKG - find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \ + xargs strip --strip-unneeded 2> /dev/null || true + find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \ + xargs strip --strip-unneeded 2> /dev/null || true ) # Add a desktop menu item @@ -73,7 +79,9 @@ install -m 0644 $CWD/$PRGNAM.desktop $PKG/usr/share/applications/ cat $CWD/$PRGNAM.png > $PKG/usr/share/pixmaps/$PRGNAM.png mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + CHANGES LICENSE* README TODO hydra-gtk/COPYING hydra-gtk/INSTALL \ + $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install @@ -81,4 +89,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} |