rpms/libwvstreams/devel wvstreams-4.6.1-make.patch, NONE, 1.1 libwvstreams.spec, 1.44, 1.45

[Ondrej Vasik]

Author: ovasik

Update of /cvs/pkgs/rpms/libwvstreams/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23097

Modified Files:
	libwvstreams.spec 
Added Files:
	wvstreams-4.6.1-make.patch 
Log Message:
Fix parallel build (#226061) - by Kamil Dudka

wvstreams-4.6.1-make.patch:
 Makefile   |    1 +
 wvrules.mk |   24 ++++++++++++------------
 2 files changed, 13 insertions(+), 12 deletions(-)

--- NEW FILE wvstreams-4.6.1-make.patch ---
diff --git a/Makefile b/Makefile
index 72c8bef..7e7f85c 100644
--- a/Makefile
+++ b/Makefile
@@ -235,6 +235,7 @@ TARGETS_A = $(filter %.a,$(TARGETS))
 all: config.mk $(filter-out $(WV_EXCLUDES), $(TARGETS))
 
 TESTS += wvtestmain
+$(TESTS): $(LIBWVSTREAMS)
 
 REAL_TESTS = $(filter-out $(TEST_SKIP_OBJS), $(TESTS))
 $(addsuffix .o,$(REAL_TESTS)):
diff --git a/wvrules.mk b/wvrules.mk
index 877f700..921c41b 100644
--- a/wvrules.mk
+++ b/wvrules.mk
@@ -158,18 +158,18 @@ endif
 ../%.o:;	@echo "Object $@ does not exist!"; exit 1
 /%.a:;		@echo "Library $@ does not exist!"; exit 1
 
-%.o: %.c;	$(call wvcc ,$@,$<,$*)
-%.fpic.o: %.c;	$(call wvcc ,$@,$<,$*,-fPIC)
-%.o: %.cc;	$(call wvcxx,$@,$<,$*)
-%.fpic.o: %.cc;	$(call wvcxx,$@,$<,$*,-fPIC)
-%.o: %.cpp;	$(call wvcxx,$@,$<,$*)
-%.fpic.o:%.cpp; $(call wvcxx,$@,$<,$*,-fPIC)
-%.s: %.c;	$(call wvcc ,$@,$<,$*,,-S)
-%.s: %.cc;	$(call wvcxx,$@,$<,$*,,-S)
-%.s: %.cpp;	$(call wvcxx,$@,$<,$*,,-S)
-%.E: %.c;	$(call wvcc,$@,$<,$*,,-E)
-%.E: %.cc;	$(call wvcxx,$@,$<,$*,,-E)
-%.E: %.cpp;	$(call wvcxx,$@,$<,$*,,-E)
+%.o: CC %.c;		$(call wvcc ,$@,$<,$*)
+%.fpic.o: CC %.c;	$(call wvcc ,$@,$<,$*,-fPIC)
+%.o: CXX %.cc;		$(call wvcxx,$@,$<,$*)
+%.fpic.o: CXX %.cc;	$(call wvcxx,$@,$<,$*,-fPIC)
+%.o: CXX %.cpp;		$(call wvcxx,$@,$<,$*)
+%.fpic.o: CXX %.cpp; 	$(call wvcxx,$@,$<,$*,-fPIC)
+%.s: CC %.c;		$(call wvcc ,$@,$<,$*,,-S)
+%.s: CXX %.cc;		$(call wvcxx,$@,$<,$*,,-S)
+%.s: CXX %.cpp;		$(call wvcxx,$@,$<,$*,,-S)
+%.E: CC %.c;		$(call wvcc,$@,$<,$*,,-E)
+%.E: CXX %.cc;		$(call wvcxx,$@,$<,$*,,-E)
+%.E: CXX %.cpp;		$(call wvcxx,$@,$<,$*,,-E)
 
 %.moc: %.h;	$(MOC) -o $@ $<
 


Index: libwvstreams.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libwvstreams/devel/libwvstreams.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- libwvstreams.spec	12 Jan 2010 17:29:58 -0000	1.44
+++ libwvstreams.spec	13 Jan 2010 12:37:01 -0000	1.45
@@ -7,6 +7,8 @@ Source: http://wvstreams.googlecode.com/
 Patch1: wvstreams-4.2.2-multilib.patch
 #install-xplc target was missing
 Patch2: wvstreams-4.5-noxplctarget.patch
+#Fix parallel build (#226061)
+Patch3: wvstreams-4.6.1-make.patch
 URL: http://alumnit.ca/wiki/index.php?page=WvStreams
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -31,6 +33,7 @@ needed for developing applications which
 %setup -q -n wvstreams-%{version}
 %patch1 -p1 -b .multilib
 %patch2 -p1 -b .xplctarget
+%patch3 -p1 -b .make
 
 %build
 #  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)