Hopefully I should be up to date with all patches; haven't integrated the module-init-tools, and some of Erik's patches didn't make it for different reasons, which hopefully can be resolved soon. If you have sent another patch which I haven't applied, please do let me know. -hpa
Erik van Konijnenburg
2005-May-25 03:13 UTC
[klibc] [PATCH] install dir for shlib consistent between makefiles
The Makefile in klibc-1.0.12/klibc uses INSTALLDIR for shlib; let the main makefile do the same. Signed-off-by: Erik van Konijnenburg <ekonijn@xs4all.nl> Index: klibc-1.0.12/Makefile ==================================================================--- klibc-1.0.12.orig/Makefile 2005-05-25 08:19:18.000000000 +0200 +++ klibc-1.0.12/Makefile 2005-05-25 12:07:01.000000000 +0200 @@ -51,8 +51,8 @@ local-install: $(CROSS)klcc mkdir -p $(INSTALLROOT)$(bindir) mkdir -p $(INSTALLROOT)$(mandir)/man1 - mkdir -p $(INSTALLROOT)$(SHLIBDIR) mkdir -p $(INSTALLROOT)$(INSTALLDIR) + mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(SHLIBDIR) -rm -rf $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)lib
On Tue, May 24, 2005 at 11:20:56PM -0700, H. Peter Anvin wrote:> Hopefully I should be up to date with all patches; haven't integrated > the module-init-tools, and some of Erik's patches didn't make it for > different reasons, which hopefully can be resolved soon.After a quick look and testing of 1.0.12: - most is either applied or replaced with a cleaner alternative - exception is nfsmount, where you need additional info on copyright, mailed earlier today. - exception is is patches for _SVID_SOURCE and _XOPEN_SOURCE defines (nr 4 and 6) which you dropped, presumably because of being too glibc-specific. I've got no real objection to dropping them, the defines can also be done in CFLAGS. - One patch got lost on my side: once <net/route.h> is introduced, a change in ipconfig if needed to actually use it. Attached. As an aside, gitweb is really wonderful for this kind of comparison. Regards, Erik Signed-off-by: Erik van Konijnenburg <ekonijn@xs4all.nl> Index: klibc-1.0.12/ipconfig/netdev.c ==================================================================--- klibc-1.0.12.orig/ipconfig/netdev.c 2005-05-25 08:19:19.000000000 +0200 +++ klibc-1.0.12/ipconfig/netdev.c 2005-05-25 12:24:36.000000000 +0200 @@ -13,7 +13,7 @@ #include <net/if.h> #include <net/if_arp.h> #include <netinet/in.h> -#include <linux/route.h> +#include <net/route.h> #include "netdev.h" Index: klibc-1.0.12/ipconfig/netdev.h ==================================================================--- klibc-1.0.12.orig/ipconfig/netdev.h 2005-05-25 08:19:19.000000000 +0200 +++ klibc-1.0.12/ipconfig/netdev.h 2005-05-25 12:25:49.000000000 +0200 @@ -2,6 +2,8 @@ * ipconfig/netdev.h */ #include <sys/utsname.h> +#include <sys/types.h> +#include <linux/types.h> #include <net/if.h> #define BPLEN 40