From 05c8709f2cda853e5bd99784147f1344d2a275cc Mon Sep 17 00:00:00 2001 From: sb Date: Tue, 22 Jun 2010 09:31:32 +0200 Subject: sb126: #i110197# remove -Wl,-z,noexecstack hack --- redland/raptor/makefile.mk | 2 +- redland/rasqal/makefile.mk | 2 +- redland/redland/makefile.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'redland') diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk index 1375ae878497..fb110e4fff37 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 d48b7af39cb4..4cf766804819 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 d6acd4d8ea4d..02770cb7fbd1 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' -- cgit From 5256f32b980016ff11e2eef15c39bd942a08d200 Mon Sep 17 00:00:00 2001 From: tono Date: Thu, 6 Jan 2011 21:56:21 +0900 Subject: mingwport33: i#116329: MinGW port enhancement: configurable libstdc++ name --- redland/raptor/makefile.mk | 2 +- redland/rasqal/makefile.mk | 2 +- redland/redland/makefile.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'redland') diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk index b67f6ef314ce..82e92b41b2b7 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= diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk index 66fca99d1600..6f2afc423f71 100644 --- a/redland/rasqal/makefile.mk +++ b/redland/rasqal/makefile.mk @@ -72,7 +72,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= diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk index 20b1210dd2f9..ac1558475c5e 100644 --- a/redland/redland/makefile.mk +++ b/redland/redland/makefile.mk @@ -72,7 +72,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= -- cgit 0-29'>distro/collabora/cp-6.0-29 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff