From a592f46a6ae06f9f06c34101a0b082575c080682 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 17 Feb 2010 01:44:01 +0000 Subject: [PATCH 1/3] Initialize branch F-13 for kBuild --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..baa94ef --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-13 From 4b4c279432dd221d60de3b33950ccd4e374e0247 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Sun, 21 Feb 2010 12:57:54 +0000 Subject: [PATCH 2/3] Merge from Rawhide --- .cvsignore | 2 +- import.log | 1 + kBuild-0.1.5-pthread.patch | 12 ++++++++++++ kBuild.spec | 9 ++++++++- sources | 2 +- 5 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 import.log create mode 100644 kBuild-0.1.5-pthread.patch diff --git a/.cvsignore b/.cvsignore index 572f794..7ca5660 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -kBuild-0.1.5-p1-src.tar.gz +kBuild-0.1.5-p2-src.tar.gz diff --git a/import.log b/import.log new file mode 100644 index 0000000..a188399 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +kBuild-0_1_5-6_p2_fc14:F-13:kBuild-0.1.5-6.p2.fc14.src.rpm:1266757055 diff --git a/kBuild-0.1.5-pthread.patch b/kBuild-0.1.5-pthread.patch new file mode 100644 index 0000000..01d6602 --- /dev/null +++ b/kBuild-0.1.5-pthread.patch @@ -0,0 +1,12 @@ +diff -up kBuild-0.1.5-p1/Config.kmk.pthreads kBuild-0.1.5-p1/Config.kmk +--- kBuild-0.1.5-p1/Config.kmk.pthreads 2010-02-18 08:27:24.287688965 +0100 ++++ kBuild-0.1.5-p1/Config.kmk 2010-02-18 08:28:07.505493345 +0100 +@@ -282,6 +282,8 @@ ifndef TEMPLATE_BIN_TOOL + endif + ifeq ($(KBUILD_TARGET),linux) + TEMPLATE_BIN_LIBS += rt ++ TEMPLATE_BIN_LIBS += pthread ++ TEMPLATE_BIN_LDFLAGS += -Wl,--as-needed + endif + TEMPLATE_BIN_CFLAGS.x86 += -m32 + TEMPLATE_BIN_CFLAGS.sparc32 += -m32 diff --git a/kBuild.spec b/kBuild.spec index 6e2edd7..2b607de 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -1,4 +1,4 @@ -%global patchlevel p1 +%global patchlevel p2 Name: kBuild Version: 0.1.5 @@ -13,6 +13,7 @@ URL: http://svn.netlabs.org/kbuild Source0: ftp://ftp.netlabs.org/pub/kbuild/%{name}-%{version}%{?patchlevel:-%{patchlevel}}-src.tar.gz Patch0: kBuild-0.1.3-escape.patch Patch1: kBuild-0.1.5-dprintf.patch +Patch2: kBuild-0.1.5-pthread.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: byacc libacl-devel flex @@ -32,6 +33,7 @@ repository. %setup -q -n %{name}-%{version}%{?patchlevel:-%{patchlevel}} %patch0 -p1 -b .escape %patch1 -p1 -b .dprintf +%patch2 -p1 -b .pthreads # Remove prebuilt stuff rm -rf kBuild/bin/* @@ -51,6 +53,7 @@ rm -rf kBuild/bin/* # The bootstrap would probably not be needed if we depended on ourselves, # yet it is not guarranteed that new versions are compilable with older # kmk versions, so with this we are on a safer side +find -name config.log -delete kBuild/env.sh --full make -f bootstrap.gmk %{bootstrap_mflags} kBuild/env.sh kmk %{mflags} rebuild @@ -77,6 +80,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Feb 17 2010 Lubomir Rintel - 0.1.5-6.p2 +- Fix build +- Update to later patch level + * Fri Jul 24 2009 Fedora Release Engineering - 0.1.5-6.p1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index a075fc1..7e06b26 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -148f821c0f9e729a1f65bc91e69f6e7a kBuild-0.1.5-p1-src.tar.gz +5e4e2193aa6cb3f095af2f99bf90d01d kBuild-0.1.5-p2-src.tar.gz From 15925dfa222eba4f794fe44a00b2520dc7cac577 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 18:57:33 +0000 Subject: [PATCH 3/3] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 1 - 4 files changed, 23 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index e463081..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: kBuild -# $Id: Makefile,v 1.1 2008/12/25 00:36:01 kevin Exp $ -NAME := kBuild -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index baa94ef..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-13 diff --git a/import.log b/import.log deleted file mode 100644 index a188399..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -kBuild-0_1_5-6_p2_fc14:F-13:kBuild-0.1.5-6.p2.fc14.src.rpm:1266757055