forked from pool/openldap2
Jan Engelhardt
17245dd92c
- Backported one hunk from upstream commit fb9e6a81bbee as openldap2-fb9e6a81bbee.patch to fix incompatible pointer type being passed to a function which is diagnosed as an error by GCC 14. If the request is OK, please forward it to Factory soon so that we can switch the default compiler. Thanks! OBS-URL: https://build.opensuse.org/request/show/1190307 OBS-URL: https://build.opensuse.org/package/show/network:ldap/openldap2?expand=0&rev=323
102 lines
3.3 KiB
Plaintext
102 lines
3.3 KiB
Plaintext
From 60edf86023da15db7be5935c85826e16d2b78648 Mon Sep 17 00:00:00 2001
|
|
From: Ralf Haferkamp <rhafer@suse.de>
|
|
Date: Fri, 12 Nov 2010 09:39:11 +0100
|
|
Subject: pie compile
|
|
|
|
|
|
diff --git a/build/top.mk b/build/top.mk
|
|
index 38ce146d7..d7fee4ec2 100644
|
|
--- a/build/top.mk
|
|
+++ b/build/top.mk
|
|
@@ -111,7 +111,7 @@ OL_VERSIONED_SYMBOLS = @OL_VERSIONED_SYMBOLS@
|
|
LTSTATIC = @LTSTATIC@
|
|
|
|
LTLINK = $(LIBTOOL) --mode=link \
|
|
- $(CC) $(LTSTATIC) $(LT_CFLAGS) $(LDFLAGS) $(LTFLAGS)
|
|
+ $(CC) -pie $(LTSTATIC) $(LT_CFLAGS) $(LDFLAGS) $(LTFLAGS)
|
|
|
|
LTCOMPILE_LIB = $(LIBTOOL) $(LTONLY_LIB) --mode=compile \
|
|
$(CC) $(LT_CFLAGS) $(LT_CPPFLAGS) $(LIB_DEFS) -c
|
|
@@ -120,7 +120,7 @@ LTLINK_LIB = $(LIBTOOL) $(LTONLY_LIB) --mode=link \
|
|
$(CC) $(LT_CFLAGS) $(LDFLAGS) $(LTFLAGS_LIB) $(SYMBOL_VERSION_FLAGS)
|
|
|
|
LTCOMPILE_MOD = $(LIBTOOL) $(LTONLY_MOD) --mode=compile \
|
|
- $(CC) $(LT_CFLAGS) $(LT_CPPFLAGS) $(MOD_DEFS) -c
|
|
+ $(CC) $(LT_CFLAGS) $(PIE_CFLAGS) $(LT_CPPFLAGS) $(MOD_DEFS) -c
|
|
|
|
LTLINK_MOD = $(LIBTOOL) $(LTONLY_MOD) --mode=link \
|
|
$(CC) $(LT_CFLAGS) $(LDFLAGS) $(LTFLAGS_MOD)
|
|
@@ -214,7 +214,7 @@ LLOADD_LIBS = @BALANCER_LIBS@ $(LEVENT_LIBS)
|
|
# Our Defaults
|
|
CC = $(AC_CC)
|
|
DEFS = $(LDAP_INCPATH) $(XINCPATH) $(XDEFS) $(AC_DEFS) $(DEFINES)
|
|
-CFLAGS = $(AC_CFLAGS) $(DEFS)
|
|
+CFLAGS = -fPIE $(AC_CFLAGS) $(DEFS)
|
|
LDFLAGS = $(LDAP_LIBPATH) $(AC_LDFLAGS) $(XLDFLAGS)
|
|
LIBS = $(XLIBS) $(XXLIBS) $(AC_LIBS) $(XXXLIBS)
|
|
|
|
diff --git a/servers/slapd/back-ldap/Makefile.in b/servers/slapd/back-ldap/Makefile.in
|
|
index 71400ca1b..6427165c6 100644
|
|
--- a/servers/slapd/back-ldap/Makefile.in
|
|
+++ b/servers/slapd/back-ldap/Makefile.in
|
|
@@ -26,6 +26,8 @@ LDAP_LIBDIR= ../../../libraries
|
|
BUILD_OPT = "--enable-ldap"
|
|
BUILD_MOD = @BUILD_LDAP@
|
|
|
|
+PIE_CFLAGS="-fPIE"
|
|
+
|
|
mod_DEFS = -DSLAPD_IMPORT
|
|
MOD_DEFS = $(@BUILD_LDAP@_DEFS)
|
|
|
|
diff --git a/servers/slapd/back-ldif/Makefile.in b/servers/slapd/back-ldif/Makefile.in
|
|
index 225c8dd19..2f07c067b 100644
|
|
--- a/servers/slapd/back-ldif/Makefile.in
|
|
+++ b/servers/slapd/back-ldif/Makefile.in
|
|
@@ -22,6 +22,8 @@ LDAP_LIBDIR= ../../../libraries
|
|
BUILD_OPT = "--enable-ldif"
|
|
BUILD_MOD = yes
|
|
|
|
+PIE_CFLAGS="-fPIE"
|
|
+
|
|
mod_DEFS = -DSLAPD_IMPORT
|
|
MOD_DEFS = $(yes_DEFS)
|
|
|
|
diff --git a/servers/slapd/back-mdb/Makefile.in b/servers/slapd/back-mdb/Makefile.in
|
|
index 6d64824da..9bbf8747d 100644
|
|
--- a/servers/slapd/back-mdb/Makefile.in
|
|
+++ b/servers/slapd/back-mdb/Makefile.in
|
|
@@ -34,6 +34,8 @@ MDB_SUBDIR = $(srcdir)/$(LDAP_LIBDIR)/liblmdb
|
|
BUILD_OPT = "--enable-mdb"
|
|
BUILD_MOD = @BUILD_MDB@
|
|
|
|
+PIE_CFLAGS="-fPIE"
|
|
+
|
|
mod_DEFS = -DSLAPD_IMPORT
|
|
MOD_DEFS = $(@BUILD_MDB@_DEFS)
|
|
MOD_LIBS = $(MDB_LIBS)
|
|
diff --git a/servers/slapd/back-monitor/Makefile.in b/servers/slapd/back-monitor/Makefile.in
|
|
index 200a1c65c..6b2afffb9 100644
|
|
--- a/servers/slapd/back-monitor/Makefile.in
|
|
+++ b/servers/slapd/back-monitor/Makefile.in
|
|
@@ -30,6 +30,8 @@ LDAP_LIBDIR= ../../../libraries
|
|
BUILD_OPT = "--enable-monitor"
|
|
BUILD_MOD = yes
|
|
|
|
+PIE_CFLAGS="-fPIE"
|
|
+
|
|
mod_DEFS = -DSLAPD_IMPORT
|
|
MOD_DEFS = $(yes_DEFS)
|
|
|
|
diff --git a/servers/slapd/back-relay/Makefile.in b/servers/slapd/back-relay/Makefile.in
|
|
index 71d74a171..60b44afd8 100644
|
|
--- a/servers/slapd/back-relay/Makefile.in
|
|
+++ b/servers/slapd/back-relay/Makefile.in
|
|
@@ -22,6 +22,8 @@ LDAP_LIBDIR= ../../../libraries
|
|
BUILD_OPT = "--enable-relay"
|
|
BUILD_MOD = @BUILD_RELAY@
|
|
|
|
+PIE_CFLAGS="-fPIE"
|
|
+
|
|
mod_DEFS = -DSLAPD_IMPORT
|
|
MOD_DEFS = $(@BUILD_RELAY@_DEFS)
|