Skip to contentSkip to conversation

dhcp: Fix hard coded libdir issue for multilib

PATCH Applied Mei Lei 3 participants 4 messages Jul 21, 2011 – Jul 22, 2011

lore
Share & tools
lore

Mei Lei

author
#0 lore raw

cover dhcp: Fix hard coded libdir issue for multilib

This pull request fixes some hard coded /usr/lib path issues, please review it.

Thanks,
Lei

The following changes since commit 8af286885353d5740971f137f8c1ada2b43dd2a8:
Paul Eggleton (1):
README.hardware: update MPC8315E-RDB instructions

are available in the git repository at:

git://git.pokylinux.org/poky-contrib lmei3/multilib-lsb-v2
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=lmei3/multilib-lsb-v2

Mei Lei (1):
dhcp: Fix libdir issue for multilib

 .../dhcp/dhcp-4.2.0/fix-external-bind.patch        |   14 +++++++-------
 meta/recipes-connectivity/dhcp/dhcp4.inc           |    2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)
author
#1 lore raw

PATCH 1/1 dhcp: Fix libdir issue for multilib

Signed-off-by Mei Lei <[email protected]>
---
 .../dhcp/dhcp-4.2.0/fix-external-bind.patch        |   14 +++++++-------
 meta/recipes-connectivity/dhcp/dhcp4.inc           |    2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)
meta/recipes-connectivity/dhcp/dhcp-4.2.0/fix-external-bind.patch +7 -7
index f03936d..4f11655 100644
@@ -28,7 +28,7 @@ index 77ed055..5a77f2d 100644
  		   scripts/solaris scripts/openwrt
  dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
 -		 ../bind/lib/libdns.a ../bind/lib/libisc.a
-+		 $(libbind)/lib/libdns.a $(libbind)/lib/libisc.a
++		 $(libbind)/libdns.a $(libbind)/libisc.a
  man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5
  EXTRA_DIST = $(man_MANS)
  

@@ -53,7 +53,7 @@ index 61049be..85aefa3 100644
  omshell_SOURCES = omshell.c
  omshell_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \
 -	        ../bind/lib/libdns.a ../bind/lib/libisc.a
-+	        $(libbind)/lib/libdns.a $(libbind)/lib/libisc.a
++	        $(libbind)/libdns.a $(libbind)/libisc.a
  
  libdhcpctl_a_SOURCES = dhcpctl.c callback.c remote.c
  

@@ -61,7 +61,7 @@ index 61049be..85aefa3 100644
  cltest_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \
 -	       ../bind/lib/libdns.a ../bind/lib/libisc.a
 \ No newline at end of file
-+	       $(libbind)/lib/libdns.a $(libbind)/lib/libisc.a
++	       $(libbind)/libdns.a $(libbind)/libisc.a
 diff --git a/omapip/Makefile.am b/omapip/Makefile.am
 index 595950a..17f2233 100644
 --- a/omapip/Makefile.am

@@ -71,7 +71,7 @@ index 595950a..17f2233 100644
  
  svtest_SOURCES = test.c
 -svtest_LDADD = libomapi.a ../bind/lib/libdns.a ../bind/lib/libisc.a
-+svtest_LDADD = libomapi.a $(libbind)/lib/libdns.a $(libbind)/lib/libisc.a
++svtest_LDADD = libomapi.a $(libbind)/libdns.a $(libbind)/libisc.a
  
 diff --git a/relay/Makefile.am b/relay/Makefile.am
 index d8757ca..a7885da 100644

@@ -82,7 +82,7 @@ index d8757ca..a7885da 100644
  dhcrelay_SOURCES = dhcrelay.c
  dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
 -		 ../bind/lib/libdns.a ../bind/lib/libisc.a
-+		 $(libbind)/lib/libdns.a $(libbind)/lib/libisc.a
++		 $(libbind)/libdns.a $(libbind)/libisc.a
  man_MANS = dhcrelay.8
  EXTRA_DIST = $(man_MANS)
  

@@ -96,8 +96,8 @@ index cdfaf47..d2c254b 100644
  dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
 -	      ../dhcpctl/libdhcpctl.a ../bind/lib/libdns.a \
 -	      ../bind/lib/libisc.a
-+	      ../dhcpctl/libdhcpctl.a $(libbind)/lib/libdns.a \
-+	      $(libbind)/lib/libisc.a
++	      ../dhcpctl/libdhcpctl.a $(libbind)/libdns.a \
++	      $(libbind)/libisc.a
  
  man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5
  EXTRA_DIST = $(man_MANS)
meta/recipes-connectivity/dhcp/dhcp4.inc +1 -1
index 885cc19..bdaa5e9 100644
@@ -25,7 +25,7 @@ EXTRA_OECONF = "--with-srv-lease-file=${localstatedir}/lib/dhcp/dhcpd.leases \
                 --with-srv6-lease-file=${localstatedir}/lib/dhcp/dhcpd6.leases \
                 --with-cli-lease-file=${localstatedir}/lib/dhcp/dhclient.leases \
                 --with-cli6-lease-file=${localstatedir}/lib/dhcp/dhclient6.leases \
-                --with-libbind=${STAGING_LIBDIR}/.. \
+                --with-libbind=${STAGING_LIBDIR}/ \
                "
 
 do_compile_prepend () {
Signature · 1 line
1.6.3.3
#2 lore raw

Re: [PATCH 1/1] dhcp: Fix libdir issue for multilib

Quoted 2 lines · Mei Lei

-+ $(libbind)/lib/libdns.a $(libbind)/lib/libisc.a
++ $(libbind)/libdns.a $(libbind)/libisc.a

I wonder if you could just replace all this craziness with "-lbind" and let the linker find the library in the usual way.

p.

Applied
#3 lore raw
In reply to Mei Lei
Quoted 22 lines · Mei Lei

This pull request fixes some hard coded /usr/lib path issues, please review it.

Thanks,
Lei

The following changes since commit 8af286885353d5740971f137f8c1ada2b43dd2a8:
Paul Eggleton (1):
README.hardware: update MPC8315E-RDB instructions

are available in the git repository at:

git://git.pokylinux.org/poky-contrib lmei3/multilib-lsb-v2
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=lmei3/multilib-lsb-v2

Mei Lei (1):
dhcp: Fix libdir issue for multilib

  .../dhcp/dhcp-4.2.0/fix-external-bind.patch        |   14 +++++++-------
  meta/recipes-connectivity/dhcp/dhcp4.inc           |    2 +-
  2 files changed, 8 insertions(+), 8 deletions(-)
Quoted 5 lines

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Merged into OE-Core

Thanks
Sau!