rpms/cudd/devel cudd-2.4.1-build-obj-dir.patch, 1.1, 1.2 cudd.spec, 1.4, 1.5
Conrad Meyer
konradm at fedoraproject.org
Sun Mar 29 21:30:31 UTC 2009
- Previous message: rpms/xfce4-mixer/F-9 .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 xfce4-mixer.spec, 1.18, 1.19
- Next message: rpms/orage/F-9 .cvsignore, 1.6, 1.7 orage.spec, 1.11, 1.12 sources, 1.6, 1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: konradm
Update of /cvs/pkgs/rpms/cudd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9704
Modified Files:
cudd-2.4.1-build-obj-dir.patch cudd.spec
Log Message:
* Sun Mar 29 2009 Conrad Meyer <konrad at tylerc.org> - 2.4.1-6
- Use Mamoru's patch (thanks!).
cudd-2.4.1-build-obj-dir.patch:
Index: cudd-2.4.1-build-obj-dir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cudd/devel/cudd-2.4.1-build-obj-dir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cudd-2.4.1-build-obj-dir.patch 29 Mar 2009 02:51:24 -0000 1.1
+++ cudd-2.4.1-build-obj-dir.patch 29 Mar 2009 21:30:31 -0000 1.2
@@ -1,5 +1,14 @@
---- Makefile.orig 2009-03-28 19:47:30.000000000 -0700
-+++ Makefile 2009-03-28 19:47:51.000000000 -0700
+--- cudd-2.4.1/Makefile.debug 2009-03-30 01:48:28.000000000 +0900
++++ cudd-2.4.1/Makefile 2009-03-30 01:48:28.000000000 +0900
+@@ -217,7 +217,7 @@
+
+ build:
+ sh ./setup.sh
+- @for dir in $(DIRS); do \
++ @for dir in $(DIRS) obj; do \
+ (cd $$dir; \
+ echo Making $$dir ...; \
+ $(MAKE) CC=$(CC) RANLIB=$(RANLIB) MFLAG= MNEMLIB= ICFLAGS="$(ICFLAGS)" XCFLAGS="$(XCFLAGS)" DDDEBUG="$(DDDEBUG)" MTRDEBUG="$(MTRDEBUG)" LDFLAGS="$(LDFLAGS)" PURE="$(PURE)" EXE="$(EXE)" )\
@@ -264,7 +264,7 @@
all:
@@ -18,3 +27,74 @@
(cd $$dir; \
echo Making static in $$dir ...; \
$(MAKE) CC=$(CC) RANLIB=$(RANLIB) MFLAG= MNEMLIB= ICFLAGS="$(ICFLAGS)" XCFLAGS="$(XCFLAGS)" DDDEBUG="$(DDDEBUG)" MTRDEBUG="$(MTRDEBUG)" LDFLAGS="$(LDFLAGS)" PURE="$(PURE)" EXE="$(EXE)" static )\
+--- cudd-2.4.1/obj/Makefile.debug 2009-03-30 01:48:28.000000000 +0900
++++ cudd-2.4.1/obj/Makefile 2009-03-30 01:55:12.000000000 +0900
+@@ -27,7 +27,7 @@
+
+ INCLUDE = $(WHERE)/include
+
+-SHLINK = -shared -Xlinker -soname -Xlinker lib$(P).so.2
++SHLINK = -shared -Xlinker -soname -Xlinker lib$(PP).so.2
+
+ LIBS = ./libobj.a $(WHERE)/cudd/libcudd.a $(WHERE)/mtr/libmtr.a \
+ $(WHERE)/st/libst.a $(WHERE)/util/libutil.a $(WHERE)/epd/libepd.a
+@@ -45,6 +45,7 @@
+
+ # files for the package
+ P = obj
++PP = cudd$(P)
+ PSRC = cuddObj.cc
+ PHDR = cuddObj.hh $(INCLUDE)/cudd.h
+ POBJ = $(PSRC:.cc=.o)
+@@ -58,13 +59,12 @@
+ UBJ = $(SRC:.cc=.u)
+
+ #------------------------------------------------------
++lib$(PP).so.2.4.1: $(POBJ) $(WHERE)/cudd/libcudd.so
++ $(CPP) $(CFLAGS) $(LDFLAGS) -o $@ $(POBJ) $(SHLINK) -lcudd -L$(WHERE)/cudd
++ ln -s lib$(PP).so.2.4.1 lib$(PP).so.2
++ ln -s lib$(PP).so.2 lib$(PP).so
+
+-libs$(P).so.2.4.1: $(POBJ)
+- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(POBJ) $(SHLINK)
+- ln -s lib$(P).so.2.4.1 lib$(P).so.2
+- ln -s lib$(P).so.2 lib$(P).so
+-
+-lib$(P).a: $(POBJ)
++lib$(PP).a: $(POBJ)
+ ar rv $@ $?
+ $(RANLIB) $@
+
+@@ -73,7 +73,7 @@
+
+ optimize_dec: lib$(P).b
+
+-lib$(P).b: $(PUBJ)
++lib$(PP).b: $(PUBJ)
+ ar rv $@ $?
+ $(RANLIB) $@
+
+@@ -93,9 +93,9 @@
+ $(TARGETu): $(SRC) $(UBJ) $(HDR) $(LIBS:.a=.b)
+ cxx -O3 -Olimit 1000 $(XCFLAGS) $(LDFLAGS) -o $@ $(UBJ) $(BLIBS) -lm
+
+-lint: llib-l$(P).ln
++lint: llib-l$(PP).ln
+
+-llib-l$(P).ln: $(PSRC) $(PHDR)
++llib-l$(PP).ln: $(PSRC) $(PHDR)
+ lint $(LINTFLAGS) $(LINTSWITCH)$(P) -I$(INCLUDE) $(PSRC)
+
+ lintpgm: lint
+@@ -104,9 +104,9 @@
+ tags: $(PSRC) $(PHDR)
+ ctags $(PSRC) $(PHDR)
+
+-all: lib$(P).so.2.4.1 lib$(P).b llib-l$(P).ln tags
++all: lib$(PP).so.2.4.1 lib$(PP).b llib-l$(PP).ln tags
+
+-static: lib$(P).a
++static: lib$(PP).a
+
+ programs: $(TARGET) $(TARGETu) lintpgm
+
Index: cudd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cudd/devel/cudd.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cudd.spec 29 Mar 2009 02:51:25 -0000 1.4
+++ cudd.spec 29 Mar 2009 21:30:31 -0000 1.5
@@ -1,6 +1,6 @@
Name: cudd
Version: 2.4.1
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: CU Decision Diagram Package
Group: Development/Libraries
License: BSD
@@ -26,6 +26,7 @@
# On 64 bit platforms, fix the size definitions of void * and long
Patch5: cudd-2.4.1-64bit.patch
# This is so that we don't get an undefined symbol:
+# (Thanks to Mamoru Tasaka for the patch.)
Patch6: cudd-2.4.1-build-obj-dir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -64,7 +65,7 @@
%patch4 -p1
%patch5 -p1
-%patch6 -p0
+%patch6 -p1
# Fix two doc files with DOS line endings
sed -i 's/\r//' dddmp/README.dddmp
@@ -155,6 +156,9 @@
%changelog
+* Sun Mar 29 2009 Conrad Meyer <konrad at tylerc.org> - 2.4.1-6
+- Use Mamoru's patch (thanks!).
+
* Sat Mar 28 2009 Conrad Meyer <konrad at tylerc.org> - 2.4.1-5
- Add patch to build obj/ directory. (Resolves missing symbol
problems.)
- Previous message: rpms/xfce4-mixer/F-9 .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 xfce4-mixer.spec, 1.18, 1.19
- Next message: rpms/orage/F-9 .cvsignore, 1.6, 1.7 orage.spec, 1.11, 1.12 sources, 1.6, 1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list