diet-bglibs.patch: folded w/ diet-bglibs-upgrade-1.0.patch 1.0
authorTomas Zeman <tzeman@volny.cz>
Wed, 15 Feb 2012 15:39:27 +0100
changeset 126 df158d44c16f
parent 125 bbbbbb4a7088
child 127 3661692b3bc1
diet-bglibs.patch: folded w/ diet-bglibs-upgrade-1.0.patch
diet-bglibs-upgrade-1.0.patch
diet-bglibs.patch
series
--- a/diet-bglibs-upgrade-1.0.patch	Wed Feb 15 15:38:58 2012 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-diet-bglibs-1.106-1 -> fw-1.0
-
-diff --git a/source/dietlibc/diet-bglibs/FrugalBuild b/source/dietlibc/diet-bglibs/FrugalBuild
-index 592f564..ffbfb08 100644
---- a/source/dietlibc/diet-bglibs/FrugalBuild
-+++ b/source/dietlibc/diet-bglibs/FrugalBuild
-@@ -3,21 +3,19 @@
- branch=diet
- pkgorig=bglibs
- pkgname=$branch-$pkgorig
--pkgver=1.104
--pkgrel=2
-+pkgver=1.106
-+pkgrel=1
- pkgdesc="One stop library package"
- makedepends=(dietlibc gcc)
- url="http://untroubled.org/bglibs/"
- archs=(i686)
- up2date='lynx -dump -nolist $url|grep $pkgorig|grep .tar.gz|head -1|sed -e "s/.*$pkgorig-\(.*\)\.tar.gz.*$/\1/"'
--source=($url/$pkgorig-$pkgver.tar.gz libtool-tag.patch)
--sha1sums=('2286c5540e160ffbf79765c35f06c0651eecc777' \
--          '63bbea48243e7e442e54701e90adcd5e89cb76bf')
-+source=($url/$pkgorig-$pkgver.tar.gz)
-+sha1sums=('5f1914299c0f91a3d5c83bf6c8c1d0b824ffe624')
- 
- build() {
- 	DDIR=/usr/lib/diet
- 	Fcd $pkgorig-$pkgver
--	patch -p0 < $Fsrcdir/libtool-tag.patch || Fdie
- 	echo "diet gcc $CFLAGS" > conf-cc
- 	echo "diet gcc -s -static" > conf-ld
- 	echo "$DDIR/include/bglibs" > conf-include
-diff --git a/source/dietlibc/diet-bglibs/libtool-tag.patch b/source/dietlibc/diet-bglibs/libtool-tag.patch
-deleted file mode 100644
-index 2172023..0000000
---- a/source/dietlibc/diet-bglibs/libtool-tag.patch
-+++ /dev/null
-@@ -1,11 +0,0 @@
----- Makefile.orig	2006-10-30 22:11:21.000000000 +0100
--+++ Makefile	2007-10-25 00:00:46.000000000 +0200
--@@ -991,7 +991,7 @@
-- 	  echo '#!/bin/sh'; \
-- 	  echo 'source=$$1; shift'; \
-- 	  echo 'base=`echo "$$source" | sed -e s:\\\\.c$$::`'; \
---	  echo exec libtool --mode=compile --silent `head -n 1 conf-cc` -I.  '-o $${base}.lo -c $$source $${1+"$$@"}'; \
--+	  echo exec libtool --mode=compile --tag=CC --silent `head -n 1 conf-cc` -I.  '-o $${base}.lo -c $$source $${1+"$$@"}'; \
-- 	) >libcompile
-- 	chmod 755 libcompile
-- 
--- a/diet-bglibs.patch	Wed Feb 15 15:38:58 2012 +0100
+++ b/diet-bglibs.patch	Wed Feb 15 15:39:27 2012 +0100
@@ -1,31 +1,29 @@
 From: Tomas Zeman <tzeman@volny.cz>
 Date: Thu, 25 Oct 2007 00:13:17 +0200
-diet-bglibs
+diet-bglibs-1.106-1
 
-diff -r bb258baca729 source/dietlibc/diet-bglibs/FrugalBuild
+diff -r 8e6c473443e9 source/dietlibc/diet-bglibs/FrugalBuild
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/source/dietlibc/diet-bglibs/FrugalBuild	Wed Feb 15 14:47:46 2012 +0100
-@@ -0,0 +1,31 @@
++++ b/source/dietlibc/diet-bglibs/FrugalBuild	Wed Feb 15 15:39:17 2012 +0100
+@@ -0,0 +1,29 @@
 +# Maintainer: Tomas Zeman <tzeman@volny.cz>
 +
 +branch=diet
 +pkgorig=bglibs
 +pkgname=$branch-$pkgorig
-+pkgver=1.104
-+pkgrel=2
++pkgver=1.106
++pkgrel=1
 +pkgdesc="One stop library package"
 +makedepends=(dietlibc gcc)
 +url="http://untroubled.org/bglibs/"
 +archs=(i686)
 +up2date='lynx -dump -nolist $url|grep $pkgorig|grep .tar.gz|head -1|sed -e "s/.*$pkgorig-\(.*\)\.tar.gz.*$/\1/"'
-+source=($url/$pkgorig-$pkgver.tar.gz libtool-tag.patch)
-+sha1sums=('2286c5540e160ffbf79765c35f06c0651eecc777' \
-+          '63bbea48243e7e442e54701e90adcd5e89cb76bf')
++source=($url/$pkgorig-$pkgver.tar.gz)
++sha1sums=('5f1914299c0f91a3d5c83bf6c8c1d0b824ffe624')
 +
 +build() {
 +	DDIR=/usr/lib/diet
 +	Fcd $pkgorig-$pkgver
-+	patch -p0 < $Fsrcdir/libtool-tag.patch || Fdie
 +	echo "diet gcc $CFLAGS" > conf-cc
 +	echo "diet gcc -s -static" > conf-ld
 +	echo "$DDIR/include/bglibs" > conf-include
@@ -37,18 +35,3 @@
 +	make install_prefix=$Fdestdir install || Fdie
 +}
 +# vim: ft=sh
-diff -r bb258baca729 source/dietlibc/diet-bglibs/libtool-tag.patch
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/source/dietlibc/diet-bglibs/libtool-tag.patch	Wed Feb 15 14:47:46 2012 +0100
-@@ -0,0 +1,11 @@
-+--- Makefile.orig	2006-10-30 22:11:21.000000000 +0100
-++++ Makefile	2007-10-25 00:00:46.000000000 +0200
-+@@ -991,7 +991,7 @@
-+ 	  echo '#!/bin/sh'; \
-+ 	  echo 'source=$$1; shift'; \
-+ 	  echo 'base=`echo "$$source" | sed -e s:\\\\.c$$::`'; \
-+-	  echo exec libtool --mode=compile --silent `head -n 1 conf-cc` -I.  '-o $${base}.lo -c $$source $${1+"$$@"}'; \
-++	  echo exec libtool --mode=compile --tag=CC --silent `head -n 1 conf-cc` -I.  '-o $${base}.lo -c $$source $${1+"$$@"}'; \
-+ 	) >libcompile
-+ 	chmod 755 libcompile
-+ 
--- a/series	Wed Feb 15 15:38:58 2012 +0100
+++ b/series	Wed Feb 15 15:39:27 2012 +0100
@@ -3,7 +3,6 @@
 gitignore.patch
 vmailmgr.patch
 diet-bglibs.patch
-diet-bglibs-upgrade-1.0.patch
 diet-cvm.patch
 diet-daemontools.patch
 bglibs.patch