httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject cvs commit: httpd-2.0/build library.mk rules.mk.in special.mk
Date Mon, 19 Jan 2004 22:58:41 GMT
jorton      2004/01/19 14:58:41

  Modified:    .        acinclude.m4
               build    library.mk rules.mk.in special.mk
  Log:
  Correct use of libtool: libtool convenience libraries which are to be
  linked directly into a program must be linked using -static and not
  -module.  Fixes build issues with libtool HEAD.
  
  * acinclude.m4 (APACHE_MODPATH_ADD): For a static module, use a
  filename with a lib prefix.
  
  * build/rules.mk.in (MOD_LINK): Use -static not -module.
  
  * build/special.mk (install-modules): Adjust special-case for
  installation of shared modules to look for libso.la not mod_so.la.
  
  * build/library.mk: Link libraries using -static.
  
  Revision  Changes    Path
  1.149     +2 -1      httpd-2.0/acinclude.m4
  
  Index: acinclude.m4
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/acinclude.m4,v
  retrieving revision 1.148
  retrieving revision 1.149
  diff -b -d -u -r1.148 -r1.149
  --- acinclude.m4	9 Jan 2004 12:03:09 -0000	1.148
  +++ acinclude.m4	19 Jan 2004 22:58:41 -0000	1.149
  @@ -170,7 +170,8 @@
   
     if test -z "$module_standalone"; then
       if test -z "$2"; then
  -      libname="mod_$1.la"
  +      # The filename of a convenience library must have a "lib" prefix:
  +      libname="lib$1.la"
         BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname"
         modpath_static="$modpath_static $libname"
         cat >>$modpath_current/modules.mk<<EOF
  
  
  
  1.11      +1 -1      httpd-2.0/build/library.mk
  
  Index: library.mk
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/build/library.mk,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -b -d -u -r1.10 -r1.11
  --- library.mk	1 Jan 2004 13:26:16 -0000	1.10
  +++ library.mk	19 Jan 2004 22:58:41 -0000	1.11
  @@ -57,4 +57,4 @@
   LTLIBRARY_OBJECTS = $(LTLIBRARY_SOURCES:.c=.lo) $(LTLIBRARY_OBJECTS_X)
   
   $(LTLIBRARY_NAME): $(LTLIBRARY_OBJECTS) $(LTLIBRARY_DEPENDENCIES)
  -	$(LINK) $(LTLIBRARY_LDFLAGS) $(LTLIBRARY_OBJECTS) $(LTLIBRARY_LIBADD)
  +	$(LINK) -static $(LTLIBRARY_LDFLAGS) $(LTLIBRARY_OBJECTS) $(LTLIBRARY_LIBADD)
  
  
  
  1.16      +1 -1      httpd-2.0/build/rules.mk.in
  
  Index: rules.mk.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/build/rules.mk.in,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -b -d -u -r1.15 -r1.16
  --- rules.mk.in	15 Jan 2004 12:52:13 -0000	1.15
  +++ rules.mk.in	19 Jan 2004 22:58:41 -0000	1.16
  @@ -83,7 +83,7 @@
   
   LINK     = $(LIBTOOL) --mode=link $(CC) $(ALL_CFLAGS) $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@
   SH_LINK  = $(SH_LIBTOOL) --mode=link $(CC) $(ALL_CFLAGS) $(LT_LDFLAGS) $(ALL_LDFLAGS) $(SH_LDFLAGS)
$(CORE_IMPLIB) $(SH_LIBS) -o $@
  -MOD_LINK = $(LIBTOOL) --mode=link $(CC) $(ALL_CFLAGS) -module $(LT_LDFLAGS) $(ALL_LDFLAGS)
-o $@
  +MOD_LINK = $(LIBTOOL) --mode=link $(CC) $(ALL_CFLAGS) -static $(LT_LDFLAGS) $(ALL_LDFLAGS)
-o $@
   
   # Cross compile commands
   
  
  
  
  1.24      +1 -1      httpd-2.0/build/special.mk
  
  Index: special.mk
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/build/special.mk,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -b -d -u -r1.23 -r1.24
  --- special.mk	19 Jan 2004 20:37:47 -0000	1.23
  +++ special.mk	19 Jan 2004 22:58:41 -0000	1.24
  @@ -64,7 +64,7 @@
   install-modules:
   	@test -d $(DESTDIR)$(libexecdir) || $(MKINSTALLDIRS) $(DESTDIR)$(libexecdir)
   	@builtin='$(BUILTIN_LIBS)'; \
  -	has_mod_so=`echo $$builtin|sed 's/^.*mod_so.*$$/has_mod_so/'`; \
  +	has_mod_so=`echo $$builtin|sed 's/^.*libso.*$$/has_mod_so/'`; \
   	if [ "x$$has_mod_so" = "xhas_mod_so" ]; then \
   		list='$(shared)'; \
   		for i in $$list; do \
  
  
  

Mime
View raw message