svn commit: r267276 - in /perl/modperl/trunk: Changes lib/Apache2/Build.pm

[st...@apache.org]

Author: stas
Date: Fri Sep  2 12:11:43 2005
New Revision: 267276

URL: http://svn.apache.org/viewcvs?rev=267276&view=rev
Log:
On cygwin some dlls might happen to be with identical base addresses
and if you try to load both of them you'll get an error and you'll
have to use the rebase utility to fix them.  this fix should prevent
this. 
Submitted by: Nikolay Ananiev <an...@thegdb.com>

Modified:
    perl/modperl/trunk/Changes
    perl/modperl/trunk/lib/Apache2/Build.pm

Modified: perl/modperl/trunk/Changes
URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/Changes?rev=267276&r1=267275&r2=267276&view=diff
==============================================================================
--- perl/modperl/trunk/Changes (original)
+++ perl/modperl/trunk/Changes Fri Sep  2 12:11:43 2005
@@ -12,6 +12,11 @@
 
 =item 2.0.2-dev
 
+On cygwin some dlls might happen to be with identical base addresses
+and if you try to load both of them you'll get an error and you'll
+have to use the rebase utility to fix them.  this fix should prevent
+this.  [Nikolay Ananiev <an...@thegdb.com>]
+
 Fix an undefined warning in DSO builds when not using MP_APXS.
 [Nikolay Ananiev <an...@thegdb.com>]
 

Modified: perl/modperl/trunk/lib/Apache2/Build.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/Apache2/Build.pm?rev=267276&r1=267275&r2=267276&view=diff
==============================================================================
--- perl/modperl/trunk/lib/Apache2/Build.pm (original)
+++ perl/modperl/trunk/lib/Apache2/Build.pm Fri Sep  2 12:11:43 2005
@@ -322,6 +322,7 @@
 
         $ldopts = join ' ',
             '--export-all-symbols',
+            '--enable-auto-image-base',
             "$self->{cwd}/src/modules/perl/$mplib",
             $ldopts;
 
@@ -1592,7 +1593,8 @@
 	$(MODPERL_RM_F) $@
 	$(MODPERL_CC) -shared -o $@ \
 	-Wl,--out-implib=$(MODPERL_LIBNAME).dll.a \
-	-Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--stack,8388608 \
+	-Wl,--export-all-symbols -Wl,--enable-auto-import \
+	-Wl,--enable-auto-image-base -Wl,--stack,8388608 \
 	$(MODPERL_PIC_OBJS) \
 	$(MODPERL_LDDLFLAGS) $(MODPERL_LDOPTS) \
 	$(MODPERL_AP_LIBS)