summaryrefslogtreecommitdiff
path: root/source/l/libssh
diff options
context:
space:
mode:
Diffstat (limited to 'source/l/libssh')
-rwxr-xr-xsource/l/libssh/libssh.SlackBuild9
-rw-r--r--source/l/libssh/libssh.no.example.build.diff11
2 files changed, 3 insertions, 17 deletions
diff --git a/source/l/libssh/libssh.SlackBuild b/source/l/libssh/libssh.SlackBuild
index 38a73272..cdfcdadd 100755
--- a/source/l/libssh/libssh.SlackBuild
+++ b/source/l/libssh/libssh.SlackBuild
@@ -32,7 +32,7 @@ NUMJOBS=${NUMJOBS:-" -j7 "}
MARCH=$( uname -m )
if [ -z "$ARCH" ]; then
case "$MARCH" in
- i?86) export ARCH=i486 ;;
+ i?86) export ARCH=i586 ;;
armv7hl) export ARCH=$MARCH ;;
arm*) export ARCH=arm ;;
# Unless $ARCH is already set, use uname -m for all other archs:
@@ -40,8 +40,8 @@ if [ -z "$ARCH" ]; then
esac
fi
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "s390" ]; then
SLKCFLAGS="-O2"
@@ -68,9 +68,6 @@ rm -rf ${PKGNAM}-${VERSION}
tar xvf $CWD/${PKGNAM}-$VERSION.tar.xz || exit 1
cd ${PKGNAM}-$VERSION || exit 1
-# These fail to build and are not packaged anyway:
-zcat $CWD/libssh.no.example.build.diff.gz | patch -p1 --verbose || exit 1
-
# Make sure ownerships and permissions are sane:
chown -R root:root .
find . \
diff --git a/source/l/libssh/libssh.no.example.build.diff b/source/l/libssh/libssh.no.example.build.diff
deleted file mode 100644
index e7f50251..00000000
--- a/source/l/libssh/libssh.no.example.build.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./CMakeLists.txt.orig 2013-01-22 04:51:59.000000000 -0600
-+++ ./CMakeLists.txt 2013-03-28 18:56:18.490047174 -0500
-@@ -89,8 +89,6 @@
- pkgconfig
- )
-
--add_subdirectory(examples)
--
- if (WITH_TESTING)
- find_package(CMockery REQUIRED)
- include(AddCMockeryTest)