summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
Diffstat (limited to 'misc')
-rw-r--r--misc/nvclock/nvclock.SlackBuild10
-rw-r--r--misc/nvclock/patches/nvclock-0.8b4-linkfix.patch18
2 files changed, 23 insertions, 5 deletions
diff --git a/misc/nvclock/nvclock.SlackBuild b/misc/nvclock/nvclock.SlackBuild
index ec5221a100..cee6772e4c 100644
--- a/misc/nvclock/nvclock.SlackBuild
+++ b/misc/nvclock/nvclock.SlackBuild
@@ -10,15 +10,13 @@
PRGNAM=nvclock
VERSION=0.8b4
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
-# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
i?86) ARCH=i486 ;;
arm*) ARCH=arm ;;
- # Unless $ARCH is already set, use uname -m for all other archs:
*) ARCH=$( uname -m ) ;;
esac
fi
@@ -59,7 +57,8 @@ find . \
# Fixup DESTDIR usage correctly
patch -p1 < $CWD/patches/nvclock-fix_DESTDIR.patch
-
+# Fix underlinking.
+patch -p1 < $CWD/patches/nvclock-0.8b4-linkfix.patch
# Fixup use of SLKCFLAGS
# If this patch causes problems, then use the other one...
patch -p1 < $CWD/patches/nvclock-use_ALL_CFLAGS.patch
@@ -75,7 +74,8 @@ CXXFLAGS="$SLKCFLAGS" \
--disable-qt \
--build=$ARCH-slackware-linux
-make
+# Will not build in parallel.
+make -j1
make install DESTDIR=$PKG
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/misc/nvclock/patches/nvclock-0.8b4-linkfix.patch b/misc/nvclock/patches/nvclock-0.8b4-linkfix.patch
new file mode 100644
index 0000000000..0029d1c74e
--- /dev/null
+++ b/misc/nvclock/patches/nvclock-0.8b4-linkfix.patch
@@ -0,0 +1,18 @@
+diff -upNr nvclock0.8b4.orign/src/gtk/Makefile.in nvclock0.8b4/src/gtk/Makefile.in
+--- nvclock0.8b4.orign/src/gtk/Makefile.in 2008-05-11 12:25:46.000000000 +0200
++++ nvclock0.8b4/src/gtk/Makefile.in 2010-02-13 19:56:24.204078277 +0100
+@@ -20,12 +20,12 @@ endif
+ ifeq ($(HAVE_NVCONTROL), yes)
+ DEPS=$(libbackend) $(libnvcontrol)
+ INCLUDES=@X11_CFLAGS@ -I./backend -I./nvcontrol -I.. -I../..
+- LIBS=@GTK_LIBS@ -L../backend -lbackend -L../nvcontrol -lnvcontrol
++ LIBS=@GTK_LIBS@ -L../backend -lbackend -L../nvcontrol -lnvcontrol -lX11 -lXext -ldl
+ OBJECTS=banner.o gl.o hw.o main.o settings.o
+ else
+ DEPS=$(libbackend)
+ INCLUDES=-I./backend -I./nvcontrol -I.. -I../..
+- LIBS=@GTK_LIBS@ -L../backend -lbackend
++ LIBS=@GTK_LIBS@ -L../backend -lbackend -lX11 -lXext -ldl
+ OBJECTS=banner.o hw.o main.o settings.o
+ endif
+