Re: [devel] apache-1.3.34rusPL30.22-alt2

["Dmitry V. Levin" <ldv@altlinux.org>]

[-- Attachment #1.1: Type: text/plain, Size: 794 bytes --]

On Sun, Mar 19, 2006 at 04:16:10AM +0300, Dmitry V. Levin wrote:
> On Sun, Mar 19, 2006 at 03:25:42AM +0300, Денис Смирнов wrote:
> [...]
> > По поводу моей попытки использовать rpath -- вот как раз она, судя по
> > всему, и не удалась.
> [...]
> > --- src/Makefile.tmpl.orig	2004-11-24 22:10:19 +0300
> > +++ src/Makefile.tmpl	2006-03-19 00:33:09 +0300
> > @@ -45,12 +45,13 @@
> >  
> >  lib$(TARGET).ep: lib$(TARGET).$(SHLIB_SUFFIX_NAME)
> >  	$(CC) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SHLIB_EXPORT) \
> > +		-Wl,--rpath=. \
> >  	      -o lib$(TARGET).ep -DSHARED_CORE_TIESTATIC main/http_main.c \
> >  		  -L. -l$(TARGET) $(LIBS)
> >  
> 
> Ещё бы.  Как вы себе представляете rpath="."?  Правильная версия attached.

Переносимая версия прилагается.


-- 
ldv

[-- Attachment #1.2: apache-1.3.34-alt-makefile.patch --]
[-- Type: text/plain, Size: 1016 bytes --]

--- 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 \

[-- Attachment #2: Type: application/pgp-signature, Size: 191 bytes --]