diff options
-rw-r--r-- | cppunit/ldflags.patch | 13 | ||||
-rw-r--r-- | cppunit/makefile.mk | 4 | ||||
-rw-r--r-- | hyphen/makefile.mk | 2 | ||||
-rw-r--r-- | libegg/source/eggtrayicon.c | 7 | ||||
-rw-r--r-- | libtextcat/makefile.mk | 6 | ||||
-rw-r--r-- | libxmlsec/makefile.mk | 8 | ||||
-rw-r--r-- | libxmlsec/xmlsec1-configure.patch | 18 | ||||
-rw-r--r-- | openssl/openssllnx.patch | 11 | ||||
-rw-r--r-- | redland/raptor/makefile.mk | 2 | ||||
-rw-r--r-- | redland/rasqal/makefile.mk | 2 | ||||
-rw-r--r-- | redland/redland/makefile.mk | 2 |
11 files changed, 56 insertions, 19 deletions
diff --git a/cppunit/ldflags.patch b/cppunit/ldflags.patch index cecd69a4b5ee..ee8d5ed897ce 100644 --- a/cppunit/ldflags.patch +++ b/cppunit/ldflags.patch @@ -1,10 +1,11 @@ ---- misc/cppunit-1.12.1/src/cppunit/Makefile.am Wed Feb 20 06:36:38 2008 -+++ misc/build/cppunit-1.12.1/src/cppunit/Makefile.am Mon May 3 17:00:41 2010 -@@ -63,5 +63,6 @@ +--- misc/cppunit-1.12.1/src/cppunit/Makefile.in 2008-02-20 06:59:55.000000000 +0100 ++++ misc/build/cppunit-1.12.1/src/cppunit/Makefile.in 2010-06-21 17:01:38.324370072 +0200 +@@ -300,7 +300,7 @@ - libcppunit_la_LDFLAGS= \ + libcppunit_la_LDFLAGS = \ -no-undefined -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ - -release $(LT_RELEASE) -+ -release $(LT_RELEASE) \ -+ @LIBADD_DL@ ++ -release $(LT_RELEASE) $(LIBADD_DL) + + all: all-am diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk index f50f4aadc164..9441e9219483 100644 --- a/cppunit/makefile.mk +++ b/cppunit/makefile.mk @@ -97,7 +97,7 @@ CONFIGURE_FLAGS = --prefix=$(shell cd $(PACKAGE_DIR) && \ LDFLAGS='$(LDFLAGS) $(OOO_STLPORT_LDFLAGS)' \ LIBS='$(OOO_STLPORT_LIBS) $(MY_LIBS)' -BUILD_ACTION = $(GNUMAKE) +BUILD_ACTION = $(GNUMAKE) -j$(EXTMAXPROCESS) BUILD_FLAGS = install OUTDIR2INC = ooo-install/include/cppunit @@ -172,7 +172,7 @@ CONFIGURE_FLAGS = --prefix=$(shell cd $(PACKAGE_DIR) && \ LDFLAGS='$(LDFLAGS) $(OOO_STLPORT_LDFLAGS)' \ LIBS='$(OOO_STLPORT_LIBS) $(MY_LIBS)' -BUILD_ACTION = $(GNUMAKE) +BUILD_ACTION = $(GNUMAKE) -j$(EXTMAXPROCESS) BUILD_FLAGS = install OUTDIR2INC = ooo-install/include/cppunit diff --git a/hyphen/makefile.mk b/hyphen/makefile.mk index f1aa3806a17c..b733398c3c8d 100644 --- a/hyphen/makefile.mk +++ b/hyphen/makefile.mk @@ -74,7 +74,7 @@ BUILD_ACTION=make hyph_en_US.dic @all: echo "Nothing to do here." .ELSE -BUILD_ACTION=make && make check +BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS) OUT2INC += hyphen.h .ENDIF diff --git a/libegg/source/eggtrayicon.c b/libegg/source/eggtrayicon.c index 603e66fbc99d..a03bbd00b9ea 100644 --- a/libegg/source/eggtrayicon.c +++ b/libegg/source/eggtrayicon.c @@ -230,10 +230,11 @@ egg_tray_icon_manager_filter (GdkXEvent *xevent, GdkEvent *event, gpointer user_ { EggTrayIcon *icon = user_data; XEvent *xev = (XEvent *)xevent; + (void)event; if (xev->xany.type == ClientMessage && xev->xclient.message_type == icon->manager_atom && - xev->xclient.data.l[1] == icon->selection_atom) + (Atom)(xev->xclient.data.l[1]) == icon->selection_atom) { egg_tray_icon_update_manager_window (icon, TRUE); } @@ -383,6 +384,7 @@ egg_tray_icon_manager_window_destroyed (EggTrayIcon *icon) static gboolean transparent_expose_event (GtkWidget *widget, GdkEventExpose *event, gpointer user_data) { + (void)user_data; gdk_window_clear_area (widget->window, event->area.x, event->area.y, event->area.width, event->area.height); return FALSE; @@ -392,6 +394,8 @@ static void make_transparent_again (GtkWidget *widget, GtkStyle *previous_style, gpointer user_data) { + (void)previous_style; + (void)user_data; gdk_window_set_back_pixmap (widget->window, NULL, TRUE); } @@ -401,6 +405,7 @@ make_transparent (GtkWidget *widget, gpointer user_data) if (GTK_WIDGET_NO_WINDOW (widget) || GTK_WIDGET_APP_PAINTABLE (widget)) return; + (void)user_data; gtk_widget_set_app_paintable (widget, TRUE); gtk_widget_set_double_buffered (widget, FALSE); gdk_window_set_back_pixmap (widget->window, NULL, TRUE); diff --git a/libtextcat/makefile.mk b/libtextcat/makefile.mk index 01a2a6eadc36..f14a69bd5113 100644 --- a/libtextcat/makefile.mk +++ b/libtextcat/makefile.mk @@ -30,6 +30,12 @@ PRJ=. PRJNAME=libtextcat TARGET=libtextcat +.IF "$(SYSTEM_LIBTEXTCAT)" == "YES" +all: + @echo "An already available installation of libtextcat should exist on your system." + @echo "Therefore the version provided here does not need to be built in addition." +.ENDIF + # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk index b7dff3e52bed..f721db3148a4 100644 --- a/libxmlsec/makefile.mk +++ b/libxmlsec/makefile.mk @@ -104,7 +104,7 @@ CONFIGURE_FLAGS=--with-libxslt=no --with-openssl=no --with-gnutls=no --with-mozi .IF "$(SYSTEM_MOZILLA)" != "YES" CONFIGURE_FLAGS+=--enable-pkgconfig=no .ENDIF -BUILD_ACTION=$(GNUMAKE) +BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) .ELSE CONFIGURE_DIR=win32 @@ -145,10 +145,6 @@ xmlsec_LDFLAGS+=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' xmlsec_LDFLAGS+=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' .ENDIF # "$(OS)$(COM)"=="SOLARISC52" -.IF "$(OS)$(COM)"=="LINUXGCC" -xmlsec_LDFLAGS+=-Wl,-z,noexecstack -.ENDIF - LDFLAGS:=$(xmlsec_LDFLAGS) .EXPORT: LDFLAGS @@ -168,7 +164,7 @@ CONFIGURE_FLAGS=--with-pic --disable-shared --disable-crypto-dl --with-libxslt=n .IF "$(SYSTEM_MOZILLA)" != "YES" CONFIGURE_FLAGS+=--enable-pkgconfig=no .ENDIF -BUILD_ACTION=$(GNUMAKE) +BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) .ENDIF diff --git a/libxmlsec/xmlsec1-configure.patch b/libxmlsec/xmlsec1-configure.patch index 943ac98bf687..f2f5f4e8f642 100644 --- a/libxmlsec/xmlsec1-configure.patch +++ b/libxmlsec/xmlsec1-configure.patch @@ -590,6 +590,15 @@ if test "z$dir" = "z/usr/lib" ; then NSS_LIBS="$NSS_LIBS_LIST" else +@@ -13166,7 +13284,7 @@ + + if test "z$NSS_INCLUDES_FOUND" = "zyes" -a "z$NSS_LIBS_FOUND" = "zyes" ; then + OLD_CPPFLAGS=$CPPFLAGS +- CPPFLAGS="$NSS_CFLAGS" ++ CPPFLAGS="$NSS_CFLAGS $NSPR_CFLAGS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + @@ -15036,7 +15154,7 @@ # values after options handling. ac_log=" @@ -734,6 +743,15 @@ dnl do not add -L/usr/lib because compiler does it anyway if test "z$dir" = "z/usr/lib" ; then NSS_LIBS="$NSS_LIBS_LIST" +@@ -738,7 +761,7 @@ + + if test "z$NSS_INCLUDES_FOUND" = "zyes" -a "z$NSS_LIBS_FOUND" = "zyes" ; then + OLD_CPPFLAGS=$CPPFLAGS +- CPPFLAGS="$NSS_CFLAGS" ++ CPPFLAGS="$NSS_CFLAGS $NSPR_CFLAGS" + AC_EGREP_CPP(yes,[ + #include <nss.h> + #if NSS_VMAJOR >= 3 && NSS_VMINOR >= 2 --- misc/xmlsec1-1.2.14/win32/Makefile.msvc 2009-06-25 22:53:18.000000000 +0200 +++ misc/build/xmlsec1-1.2.14/win32/Makefile.msvc 2009-10-01 10:28:50.997747312 +0200 @@ -376,7 +376,7 @@ diff --git a/openssl/openssllnx.patch b/openssl/openssllnx.patch index abd10061ff5c..449ebce2cae1 100644 --- a/openssl/openssllnx.patch +++ b/openssl/openssllnx.patch @@ -10,6 +10,17 @@ "nextstep", "cc:-O -Wall:<libc.h>:(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::", "nextstep3.3", "cc:-O3 -Wall:<libc.h>:(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::", +--- misc/build/openssl-0.9.8o/Makefile.org 2010-01-27 17:06:36.000000000 +0100 ++++ misc/build/openssl-0.9.8o/Makefile.org 2010-09-20 09:24:00.000000000 +0100 +@@ -199,7 +199,7 @@ + + BUILDENV= PLATFORM='${PLATFORM}' PROCESSOR='${PROCESSOR}' \ + CC='${CC}' CFLAG='${CFLAG}' \ +- AS='${CC}' ASFLAG='${CFLAG} -c' \ ++ AS='${CC}' ASFLAG='${CFLAG} -c -Wa,--noexecstack' \ + AR='${AR}' PERL='${PERL}' RANLIB='${RANLIB}' \ + SDIRS='${SDIRS}' LIBRPATH='${INSTALLTOP}/$(LIBDIR)' \ + INSTALL_PREFIX='${INSTALL_PREFIX}' \ --- misc/openssl-0.9.8o/config 2009-02-16 09:43:41.000000000 +0100 +++ misc/build/openssl-0.9.8o/config 2009-03-30 08:59:09.588448000 +0200 @@ -399,27 +399,21 @@ diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk index 62d4f704d0e4..b67f6ef314ce 100644 --- a/redland/raptor/makefile.mk +++ b/redland/raptor/makefile.mk @@ -93,7 +93,7 @@ BUILD_DIR=$(CONFIGURE_DIR)$/src .ELSE # "WNT" .IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC" -LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec -Wl,-z,noexecstack +LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec .ENDIF # "$(OS)$(COM)"=="LINUXGCC" .IF "$(OS)$(COM)"=="SOLARISC52" LDFLAGS:=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk index efe099c88049..66fca99d1600 100644 --- a/redland/rasqal/makefile.mk +++ b/redland/rasqal/makefile.mk @@ -89,7 +89,7 @@ BUILD_DIR=$(CONFIGURE_DIR)$/src .ELSE # "WNT" .IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC" -LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec -Wl,-z,noexecstack +LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec .ENDIF # "$(OS)$(COM)"=="LINUXGCC" .IF "$(OS)$(COM)"=="SOLARISC52" LDFLAGS:=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk index 3db7c0559d2e..20b1210dd2f9 100644 --- a/redland/redland/makefile.mk +++ b/redland/redland/makefile.mk @@ -89,7 +89,7 @@ BUILD_DIR=$(CONFIGURE_DIR)$/librdf .ELSE # "WNT" .IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC" -LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec -Wl,-z,noexecstack +LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec .ENDIF # "$(OS)$(COM)"=="LINUXGCC" .IF "$(OS)$(COM)"=="SOLARISC52" LDFLAGS:=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' |