aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2012-01-03 09:45:22 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2012-01-03 10:04:44 +0000
commit8580c902f26bfdde8552e9a91d2f351ba384701a (patch)
tree14fdccce6ac4f22d1e5e8cd55cc0decb3f0d085c
parent825163e06e2d0c82a9bf2e0255cfee66790ac178 (diff)
downloadaports-8580c902f26bfdde8552e9a91d2f351ba384701a.tar.bz2
aports-8580c902f26bfdde8552e9a91d2f351ba384701a.tar.xz
main/slim: build fix: explicit linking to pthread
-rw-r--r--main/slim/APKBUILD15
-rw-r--r--main/slim/pthread.patch11
2 files changed, 21 insertions, 5 deletions
diff --git a/main/slim/APKBUILD b/main/slim/APKBUILD
index 55ebe923b4..bce7f473ed 100644
--- a/main/slim/APKBUILD
+++ b/main/slim/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=slim
pkgver=1.3.2
-pkgrel=2
+pkgrel=3
pkgdesc="Desktop-independent graphical login manager for X11"
url="http://slim.berlios.de/"
arch="all"
@@ -15,12 +15,16 @@ source="http://download.berlios.de/$pkgname/$pkgname-$pkgver.tar.gz
$pkgname.logrotate
$pkgname.initd
slim-restart.patch
- slim-png15.patch"
+ slim-png15.patch
+ pthread.patch
+ "
prepare() {
cd "$srcdir/slim-$pkgver"
- for i in ../*.patch; do
- patch -p1 -i $i || return 1
+ for i in $source; do
+ case $i in
+ *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+ esac
done
#libpng 1.4.0
@@ -63,4 +67,5 @@ cd63232c7770b0e67a009a94c2a46b82 slim-alpinelinux.tar.gz
43da096480bf72c3ccec8ad8400f34f0 slim.logrotate
6ee3a023e56052528295034be809cfc6 slim.initd
648d871fe7d2a97b7d7b928019e2feee slim-restart.patch
-8f63afd7cd390cb8d65f10fb167d4a71 slim-png15.patch"
+8f63afd7cd390cb8d65f10fb167d4a71 slim-png15.patch
+49cb6cae0b8aa6980b88f90dad2524cf pthread.patch"
diff --git a/main/slim/pthread.patch b/main/slim/pthread.patch
new file mode 100644
index 0000000000..9a1379ad10
--- /dev/null
+++ b/main/slim/pthread.patch
@@ -0,0 +1,11 @@
+--- ./Makefile.orig
++++ ./Makefile
+@@ -7,7 +7,7 @@
+ CC=/usr/bin/gcc
+ CFLAGS=-Wall -I. -I/usr/include/freetype2 -I/usr/include/freetype2/config -I/usr/include/libpng12 -I/usr/include
+ CXXFLAGS=$(CFLAGS)
+-LDFLAGS=-lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng12 -lz -lm -lcrypt -lXmu -lpng -ljpeg -lrt
++LDFLAGS=-lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng12 -lz -lm -lcrypt -lXmu -lpng -ljpeg -lrt -lpthread
+ CUSTOM=-DHAVE_SHADOW
+ ifdef USE_PAM
+ LDFLAGS+= -lpam