diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-09 09:55:09 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-09 09:55:09 +0100 |
| commit | 89c4f8907fb3cf30b7e0a8837c01f525b8609d00 (patch) | |
| tree | e3151b3bd808b097c08e29519e59d0fe906950df /redland | |
| parent | b54d64f2b8234f620b0f11fbc298dcb68119b408 (diff) | |
| parent | 890599fd2bd872aaa52a278febc7b72036ce0664 (diff) | |
Merge commit 'ooo/DEV300_m101' into intm101
Conflicts:
cppunit/ldflags.patch
hyphen/hyphen-2.4.patch
libegg/source/eggtrayicon.c
libtextcat/makefile.mk
Diffstat (limited to 'redland')
| -rw-r--r-- | redland/raptor/makefile.mk | 4 | ||||
| -rw-r--r-- | redland/rasqal/makefile.mk | 4 | ||||
| -rw-r--r-- | redland/redland/makefile.mk | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk index 12a3930dc8d0..bbedd36bec62 100644 --- a/redland/raptor/makefile.mk +++ b/redland/raptor/makefile.mk @@ -74,7 +74,7 @@ raptor_CC+=-shared-libgcc .ENDIF raptor_LIBS= .IF "$(MINGW_SHARED_GXXLIB)"=="YES" -raptor_LIBS+=-lstdc++_s +raptor_LIBS+=$(MINGW_SHARED_LIBSTDCPP) .ENDIF CONFIGURE_DIR= @@ -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 bf425089773f..a4c2187d483c 100644 --- a/redland/rasqal/makefile.mk +++ b/redland/rasqal/makefile.mk @@ -73,7 +73,7 @@ rasqal_CC+=-shared-libgcc .ENDIF rasqal_LIBS= .IF "$(MINGW_SHARED_GXXLIB)"=="YES" -rasqal_LIBS+=-lstdc++_s +rasqal_LIBS+=$(MINGW_SHARED_LIBSTDCPP) .ENDIF CONFIGURE_DIR= @@ -90,7 +90,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 01652c1364a3..c8a04dce3b45 100644 --- a/redland/redland/makefile.mk +++ b/redland/redland/makefile.mk @@ -73,7 +73,7 @@ redland_CC+=-shared-libgcc .ENDIF redland_LIBS= .IF "$(MINGW_SHARED_GXXLIB)"=="YES" -redland_LIBS+=-lstdc++_s +redland_LIBS+=$(MINGW_SHARED_LIBSTDCPP) .ENDIF CONFIGURE_DIR= @@ -90,7 +90,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' |