Репозиторий ALT Linux backports/2.4
Последнее обновление: 9 июля 2008 | Пакетов: 497 | Посещений: 1594674
 поиск   регистрация   авторизация 
 
Группа :: Система/Серверы
Пакет: apache

 Главная   Изменения   Спек   Патчи   Загрузить   Bugs and FR 

Патч: apache-1.3.34-alt-linkage.patch


diff -upk.orig apache_1.3.34.orig/src/Configure apache_1.3.34/src/Configure
--- apache_1.3.34.orig/src/Configure	2004-11-24 19:10:19 +0000
+++ apache_1.3.34/src/Configure	2006-03-23 00:26:42 +0000
@@ -2567,7 +2567,7 @@ dummy $(LIB): $(OBJS)
 
 .c.so:
 	$(CC) -c $(INCLUDES) $(CFLAGS) $(CFLAGS_SHLIB) $< && mv $*.o $*.lo
-	$(LD_SHLIB) $(LDFLAGS_SHLIB) -o $@ $*.lo $(LIBS_SHLIB)
+	$(LD_SHLIB) $(LDFLAGS_SHLIB) -o $@ $*.lo $(LIBS_SHLIB) $(LIBS)
 
 clean:
 	rm -f $(LIB) $(OBJS) $(SHLIBS) $(OBJS_PIC)
diff -upk.orig apache_1.3.34.orig/src/Makefile.tmpl apache_1.3.34/src/Makefile.tmpl
--- apache_1.3.34.orig/src/Makefile.tmpl	2004-11-24 19:10:19 +0000
+++ apache_1.3.34/src/Makefile.tmpl	2006-03-21 17:36:45 +0000
@@ -46,11 +46,11 @@ target_shared: $(SHCORE_IMPLIB) $(SHARED
 lib$(TARGET).ep: lib$(TARGET).$(SHLIB_SUFFIX_NAME)
 	$(CC) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SHLIB_EXPORT) \
 	      -o lib$(TARGET).ep -DSHARED_CORE_TIESTATIC main/http_main.c \
-		  -L. -l$(TARGET) $(LIBS)
+		  -L. -l$(TARGET) $(LIBS) -Wl,--rpath,\$$ORIGIN
 
 lib$(TARGET).$(SHLIB_SUFFIX_NAME): subdirs modules.o
 	$(CC) -c $(INCLUDES) $(CFLAGS) buildmark.c
-	$(LD_SHLIB) $(LDFLAGS_SHLIB) -o lib$(TARGET).$(SHLIB_SUFFIX_NAME) buildmark.o $(OBJS) $(REGLIB) $(EXPATLIB) $(LD_SHCORE_DEF) $(LD_SHCORE_LIBS)
+	$(LD_SHLIB) $(LDFLAGS_SHLIB) -o lib$(TARGET).$(SHLIB_SUFFIX_NAME) buildmark.o $(OBJS) $(REGLIB) $(EXPATLIB) $(LD_SHCORE_DEF) $(LD_SHCORE_LIBS) $(LIBS)
 	@if [ ".$(SHLIB_SUFFIX_LIST)" != . ]; then \
 		rm -f lib$(TARGET).$(SHLIB_SUFFIX_NAME).*; \
 		for suffix in $(SHLIB_SUFFIX_LIST) ""; do \
 
design & coding: Vladimir Lettiev aka crux © 2004-2005