kconf: .so linking

kconf: .so linking

[Arjan van de Ven]

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

Hi,

in the 2.5.74 kconfig makefile, the scripts/kconfig/conf binary is built
such that it requires a scripts/kconfig/libkconfig.so relative to the
current working directory. Several tools (like rpm and prelink) really
really don't like this, and in addition it's just untidy.

The attached patch fixes this by linking the .so file into the conf
binary with an "origine" path which means "same directory as the
binary". This keeps the tools happy and works better as a side effect.

Greetings,
   Arjan van de Ven

[-- Attachment #1.2: Type: text/plain, Size: 1081 bytes --]

--- linux-2.5.74/scripts/kconfig/Makefile.org	2003-07-02 22:57:42.000000000 +0200
+++ linux-2.5.74/scripts/kconfig/Makefile	2003-07-09 12:20:49.019013406 +0200
@@ -15,7 +15,7 @@
 libkconfig-objs := zconf.tab.o
 
 host-progs	:= conf mconf qconf gconf
-conf-objs	:= conf.o  libkconfig.so
+conf-objs	:= conf.o
 mconf-objs	:= mconf.o libkconfig.so
 
 ifeq ($(MAKECMDGOALS),$(obj)/qconf)
@@ -34,13 +34,15 @@
 HOSTCFLAGS_lex.zconf.o	:= -I$(src)
 HOSTCFLAGS_zconf.tab.o	:= -I$(src)
 
+HOSTLOADLIBES_conf	= -Wl,-rpath,\$$ORIGIN -Lscripts/kconfig -lkconfig
+
 HOSTLOADLIBES_qconf	= -L$(QTDIR)/lib -Wl,-rpath,$(QTDIR)/lib -l$(QTLIB) -ldl
 HOSTCXXFLAGS_qconf.o	= -I$(QTDIR)/include 
 
 HOSTLOADLIBES_gconf	= `pkg-config gtk+-2.0 gmodule-2.0 libglade-2.0 --libs`
 HOSTCFLAGS_gconf.o	= `pkg-config gtk+-2.0 gmodule-2.0 libglade-2.0 --cflags`
 
-$(obj)/conf.o $(obj)/mconf.o $(obj)/qconf.o $(obj)/gconf.o: $(obj)/zconf.tab.h
+$(obj)/conf.o $(obj)/mconf.o $(obj)/qconf.o $(obj)/gconf.o: $(obj)/zconf.tab.h $(obj)/libkconfig.so
 
 $(obj)/qconf.o: $(obj)/.tmp_qtcheck
 

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 189 bytes --]