Changeset 7281ad1

Timestamp:

2012-09-15T15:59:17Z (12 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

b3d99e3

Parents:

68709f5

Message:

Allow building position-independent executables. #981, patch from brainsmoke.

Files:

• Makefile (modified) (2 diffs)
• configure (modified) (5 diffs)
• lib/Makefile (modified) (1 diff)
• protocols/Makefile (modified) (1 diff)
• protocols/jabber/Makefile (modified) (1 diff)
• protocols/msn/Makefile (modified) (1 diff)
• protocols/oscar/Makefile (modified) (1 diff)
• protocols/purple/Makefile (modified) (1 diff)
• protocols/twitter/Makefile (modified) (1 diff)
• protocols/yahoo/Makefile (modified) (1 diff)

Makefile

@@ -171 +171 @@
 $(objects): %.o: $(_SRCDIR_)%.c
         @echo '*' Compiling $<
-        @$(CC) -c $(CFLAGS) $< -o $@
+        @$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
 
 $(objects): Makefile Makefile.settings config.h
@@ -177 +177 @@
 $(OUTFILE): $(objects) $(subdirs)
         @echo '*' Linking $(OUTFILE)
-        @$(CC) $(objects) $(subdirobjs) -o $(OUTFILE) $(LFLAGS) $(EFLAGS)
+        @$(CC) $(objects) $(subdirobjs) -o $(OUTFILE) $(LDFLAGS_BITLBEE) $(LFLAGS) $(EFLAGS)
 ifndef DEBUG
         @echo '*' Stripping $(OUTFILE)

configure

@@ -42 +42 @@
 ssl=auto
 
+pie=1
+
 arch=`uname -s`
 cpu=`uname -m`
@@ -80 +82 @@
 --debug=0/1     Disable/enable debugging                $debug
 --strip=0/1     Disable/enable binary stripping         $strip
+--pie=0/1       Build position independent executable   $pie
 --gcov=0/1      Disable/enable test coverage reporting  $gcov
 --plugins=0/1   Disable/enable plugins support          $plugins
@@ -90 +93 @@
 --ssl=...       SSL library to use (gnutls, nss, openssl, bogus, auto)
                                                         $ssl
+
 
 --target=...    Cross compilation target                same as host
@@ -198 +202 @@
 else
         [ -z "$CFLAGS" ] && CFLAGS="-O2 -fno-strict-aliasing"
+fi
+
+if [ "$pie" = "1" ]; then
+        echo 'CFLAGS_BITLBEE=-fPIE' >> Makefile.settings
+        echo 'LDFLAGS_BITLBEE=-pie' >> Makefile.settings
 fi
 
@@ -748 +757 @@
 fi
 
+if [ "$pie" = "1" ]; then
+        echo '  Building PIE executable'
+else
+        echo '  Building non-PIE executable'
+fi
+
 if [ "$strip" = "1" ]; then
         echo '  Binary stripping enabled.'

lib/Makefile

@@ -42 +42 @@
 $(objects): %.o: $(_SRCDIR_)%.c
         @echo '*' Compiling $<
-        @$(CC) -c $(CFLAGS) $< -o $@
+        @$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
 
 -include .depend/*.d

protocols/Makefile

@@ -55 +55 @@
 $(objects): %.o: $(_SRCDIR_)%.c
         @echo '*' Compiling $<
-        @$(CC) -c $(CFLAGS) $< -o $@
+        @$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
 
 -include .depend/*.d

protocols/jabber/Makefile

@@ -38 +38 @@
 $(objects): %.o: $(_SRCDIR_)%.c
         @echo '*' Compiling $<
-        @$(CC) -c $(CFLAGS) $< -o $@
+        @$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
 
 jabber_mod.o: $(objects)

protocols/msn/Makefile

@@ -38 +38 @@
 $(objects): %.o: $(_SRCDIR_)%.c
         @echo '*' Compiling $<
-        @$(CC) -c $(CFLAGS) $< -o $@
+        @$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
 
 msn_mod.o: $(objects)

protocols/oscar/Makefile

@@ -39 +39 @@
 $(objects): %.o: $(_SRCDIR_)%.c
         @echo '*' Compiling $<
-        @$(CC) -c $(CFLAGS) $< -o $@
+        @$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
 
 oscar_mod.o: $(objects)

protocols/purple/Makefile

@@ -39 +39 @@
 $(objects): %.o: $(_SRCDIR_)%.c
         @echo '*' Compiling $<
-        @$(CC) -c $(CFLAGS) $< -o $@
+        @$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
 
 purple_mod.o: $(objects)

protocols/twitter/Makefile

@@ -38 +38 @@
 $(objects): %.o: $(_SRCDIR_)%.c
         @echo '*' Compiling $<
-        @$(CC) -c $(CFLAGS) $< -o $@
+        @$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
 
 twitter_mod.o: $(objects)

protocols/yahoo/Makefile

@@ -39 +39 @@
 $(objects): %.o: $(_SRCDIR_)%.c
         @echo '*' Compiling $<
-        @$(CC) -c $(CFLAGS) $< -o $@
+        @$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@
 
 yahoo_mod.o: $(objects)