rpm/cyrus-sasl
SHA256
1
0
Fork 0
forked from pool/cyrus-sasl
Code Pull Requests Activity

more work on parallel make

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/network/cyrus-sasl?expand=0&rev=14
This commit is contained in:
Stephan Kulow 2010-06-07 13:28:58 +00:00 committed by Git OBS Bridge
parent 96fcb7ad46
commit 620ed2d85f
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
cyrus-sasl.dif
View File

@ -1,7 +1,7 @@
Index: cmulocal/cyrus.m4
===================================================================
--- cmulocal/cyrus.m4.orig 2010-06-07 08:12:01.970338718 +0200
+++ cmulocal/cyrus.m4 2010-06-07 08:12:05.411368488 +0200
--- cmulocal/cyrus.m4.orig 2009-04-28 17:09:13.000000000 +0200
+++ cmulocal/cyrus.m4 2010-06-07 15:27:08.000000000 +0200
@@ -37,7 +37,7 @@ AC_DEFUN([CMU_GUESS_RUNPATH_SWITCH], [
SAVE_LDFLAGS="${LDFLAGS}"
LDFLAGS="-R /usr/lib"
@ -13,8 +13,8 @@ Index: cmulocal/cyrus.m4
])
Index: Makefile.am
===================================================================
--- Makefile.am.orig 2010-06-07 08:12:01.970338718 +0200
+++ Makefile.am 2010-06-07 08:12:05.412348032 +0200
--- Makefile.am.orig 2006-05-19 16:45:21.000000000 +0200
+++ Makefile.am 2010-06-07 15:27:08.000000000 +0200
@@ -43,6 +43,7 @@ AUTOMAKE_OPTIONS = 1.7
#
################################################################
@ -25,8 +25,8 @@ Index: Makefile.am
else
Index: configure.in
===================================================================
--- configure.in.orig 2010-06-07 08:12:01.970338718 +0200
+++ configure.in 2010-06-07 08:12:05.412348032 +0200
--- configure.in.orig 2009-04-28 17:18:04.000000000 +0200
+++ configure.in 2010-06-07 15:27:08.000000000 +0200
@@ -52,6 +52,7 @@ AC_CACHE_LOAD
fi
@ -37,8 +37,8 @@ Index: configure.in
Index: plugins/Makefile.am
===================================================================
--- plugins/Makefile.am.orig 2010-06-07 08:12:01.970338718 +0200
+++ plugins/Makefile.am 2010-06-07 08:12:05.413338170 +0200
--- plugins/Makefile.am.orig 2009-04-28 17:09:17.000000000 +0200
+++ plugins/Makefile.am 2010-06-07 15:27:08.000000000 +0200
@@ -46,23 +46,10 @@
# Library version info - here at the top, for sanity
@ -143,8 +143,8 @@ Index: plugins/Makefile.am
Index: sasldb/Makefile.am
===================================================================
--- sasldb/Makefile.am.orig 2010-06-07 08:12:02.020337539 +0200
+++ sasldb/Makefile.am 2010-06-07 08:12:47.433338361 +0200
--- sasldb/Makefile.am.orig 2009-04-28 17:09:18.000000000 +0200
+++ sasldb/Makefile.am 2010-06-07 15:28:37.000000000 +0200
@@ -48,6 +48,7 @@ INCLUDES=-I$(top_srcdir)/include -I$(top
extra_common_sources = db_none.c db_ndbm.c db_gdbm.c db_berkeley.c
@ -153,11 +153,12 @@ Index: sasldb/Makefile.am
EXTRA_DIST = NTMakefile
noinst_LTLIBRARIES = libsasldb.la
@@ -66,3 +67,7 @@ libsasldb.a: libsasldb.la $(SASL_DB_BACK
@@ -66,3 +67,8 @@ libsasldb.a: libsasldb.la $(SASL_DB_BACK
$(AR) cru .libs/$@ $(SASL_DB_BACKEND_STATIC)
+# avoid these two files created at the same time, they use both the same
+# dep file
+db_berkeley.lo: db_berkeley.o
+allockey.lo: allockey.o
+