install development libraries into /lib

- otherwise libopenssl compile fails

2 files changed, 80 insertions, 0 deletions

diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile
index 4c3207c4a..9ecb2afa4 100644
--- a/toolchain/uClibc/Makefile
+++ b/toolchain/uClibc/Makefile
@@ -48,6 +48,7 @@ $(WRKBUILD)/.install_headers: $(WRKBUILD)/.compiled
 	$(MAKE) -C $(WRKBUILD) \
 		PREFIX=$(STAGING_DIR) \
 		DEVEL_PREFIX=/usr/ \
+		DEVEL_PREFIX_LIB=/ \
 		RUNTIME_PREFIX=/ \
 		CPU_CFLAGS="$(TARGET_CFLAGS)" \
 		install_dev
@@ -57,6 +58,7 @@ $(WRKBUILD)/.installed: $(WRKBUILD)/.install_headers
 	$(MAKE) -C $(WRKBUILD) \
 		PREFIX=$(STAGING_DIR) \
 		DEVEL_PREFIX=/usr/ \
+		DEVEL_PREFIX_LIB=/ \
 		RUNTIME_PREFIX=/ \
 		CPU_CFLAGS="$(TARGET_CFLAGS)" \
 		install_runtime
diff --git a/toolchain/uClibc/patches/devel-prefix-lib.patch b/toolchain/uClibc/patches/devel-prefix-lib.patch
new file mode 100644
index 000000000..b0f8a8011
--- /dev/null
+++ b/toolchain/uClibc/patches/devel-prefix-lib.patch
@@ -0,0 +1,78 @@
+diff -Nur uClibc-0.9.30.1.orig/Makefile.in uClibc-0.9.30.1/Makefile.in
+--- uClibc-0.9.30.1.orig/Makefile.in	2008-11-17 23:38:34.000000000 +0100
++++ uClibc-0.9.30.1/Makefile.in	2009-12-07 20:34:07.000000000 +0100
+@@ -190,7 +190,7 @@
+ install: install_runtime install_dev
+ 
+ 
+-RUNTIME_PREFIX_LIB_FROM_DEVEL_PREFIX_LIB=$(shell $(top_srcdir)extra/scripts/relative_path.sh $(DEVEL_PREFIX)lib $(RUNTIME_PREFIX)lib)
++RUNTIME_PREFIX_LIB_FROM_DEVEL_PREFIX_LIB=$(shell $(top_srcdir)extra/scripts/relative_path.sh $(DEVEL_PREFIX_LIB)lib $(RUNTIME_PREFIX)lib)
+ 
+ $(top_builddir)extra/scripts/unifdef: $(top_srcdir)extra/scripts/unifdef.c
+ 	$(hcompile.u)
+@@ -370,41 +370,41 @@
+ 
+ # Installs development library links.
+ install_dev: install_headers all
+-	$(INSTALL) -d $(PREFIX)$(DEVEL_PREFIX)lib
+-	-$(INSTALL) -m 644 lib/*.[ao] $(PREFIX)$(DEVEL_PREFIX)lib/
++	$(INSTALL) -d $(PREFIX)$(DEVEL_PREFIX_LIB)lib
++	-$(INSTALL) -m 644 lib/*.[ao] $(PREFIX)$(DEVEL_PREFIX_LIB)lib/
+ ifeq ($(HAVE_SHARED),y)
+ 	for i in `find lib/ -type l -name 'lib[a-zA-Z]*.so' | \
+ 	$(SED) -e 's/lib\///'` ; do \
+ 		$(LN) -sf $(RUNTIME_PREFIX_LIB_FROM_DEVEL_PREFIX_LIB)$$i.$(MAJOR_VERSION) \
+-		$(PREFIX)$(DEVEL_PREFIX)lib/$$i; \
++		$(PREFIX)$(DEVEL_PREFIX_LIB)lib/$$i; \
+ 	done
+ 	if [ -f $(top_builddir)lib/libc.so -a -f $(PREFIX)$(RUNTIME_PREFIX)lib/$(SHARED_MAJORNAME) ] ; then \
+-		$(RM) $(PREFIX)$(DEVEL_PREFIX)lib/libc.so; \
+-		$(SED) -e 's:$(NONSHARED_LIBNAME):$(DEVEL_PREFIX)lib/$(NONSHARED_LIBNAME):' \
++		$(RM) $(PREFIX)$(DEVEL_PREFIX_LIB)lib/libc.so; \
++		$(SED) -e 's:$(NONSHARED_LIBNAME):$(DEVEL_PREFIX_LIB)lib/$(NONSHARED_LIBNAME):' \
+ 		    -e 's:$(SHARED_MAJORNAME):$(RUNTIME_PREFIX)lib/$(SHARED_MAJORNAME):' \
+ 		    -e 's:$(UCLIBC_LDSO):$(RUNTIME_PREFIX)lib/$(UCLIBC_LDSO):' \
+-		    $(top_builddir)lib/libc.so > $(PREFIX)$(DEVEL_PREFIX)lib/libc.so; \
++		    $(top_builddir)lib/libc.so > $(PREFIX)$(DEVEL_PREFIX_LIB)lib/libc.so; \
+ 	fi
+ ifeq ($(UCLIBC_HAS_THREADS),y)
+ ifneq ($(LINUXTHREADS_OLD),y)
+ 	if [ -f $(top_builddir)lib/libpthread.so -a -f $(PREFIX)$(RUNTIME_PREFIX)lib/libpthread.so.$(MAJOR_VERSION) ] ; then \
+-		$(RM) $(PREFIX)$(DEVEL_PREFIX)lib/libpthread.so; \
+-		cp $(top_srcdir)extra/scripts/format.lds $(PREFIX)$(DEVEL_PREFIX)lib/libpthread.so; \
+-		echo "GROUP ( $(RUNTIME_PREFIX)lib/libpthread.so.$(MAJOR_VERSION) $(DEVEL_PREFIX)lib/libpthread_nonshared.a )" \
+-			>> $(PREFIX)$(DEVEL_PREFIX)lib/libpthread.so; \
++		$(RM) $(PREFIX)$(DEVEL_PREFIX_LIB)lib/libpthread.so; \
++		cp $(top_srcdir)extra/scripts/format.lds $(PREFIX)$(DEVEL_PREFIX_LIB)lib/libpthread.so; \
++		echo "GROUP ( $(RUNTIME_PREFIX)lib/libpthread.so.$(MAJOR_VERSION) $(DEVEL_PREFIX_LIB)lib/libpthread_nonshared.a )" \
++			>> $(PREFIX)$(DEVEL_PREFIX_LIB)lib/libpthread.so; \
+ 	fi
+ endif
+ endif
+ ifeq ($(PTHREADS_DEBUG_SUPPORT),y)
+ 	$(LN) -sf $(RUNTIME_PREFIX_LIB_FROM_DEVEL_PREFIX_LIB)libthread_db.so.1 \
+-		$(PREFIX)$(DEVEL_PREFIX)lib/libthread_db.so
++		$(PREFIX)$(DEVEL_PREFIX_LIB)lib/libthread_db.so
+ endif
+ ifeq ($(DOPIC),y)
+ #	# If we build shared libraries then the static libs are PIC...
+ #	# Make _pic.a symlinks to make mklibs.py and similar tools happy.
+ 	if [ -d lib ] ; then \
+ 		for i in `find lib/ -type f -name 'lib*.a' | $(SED) -e 's/lib\///'` ; do \
+-			$(LN) -sf $$i $(PREFIX)$(DEVEL_PREFIX)lib/`echo $$i \
++			$(LN) -sf $$i $(PREFIX)$(DEVEL_PREFIX_LIB)lib/`echo $$i \
+ 				| $(SED) -e 's/\.a$$/_pic.a/'`; \
+ 		done ; \
+ 	fi
+@@ -413,9 +413,9 @@
+ ifeq ($(UCLIBC_FORMAT_SHARED_FLAT),y)
+ 	for file in lib/lib*.gdb; do \
+ 		if test -f $$file; then \
+-			$(INSTALL) -m 755 $$file $(PREFIX)$(DEVEL_PREFIX)lib; \
++			$(INSTALL) -m 755 $$file $(PREFIX)$(DEVEL_PREFIX_LIB)lib; \
+ 			$(INSTALL) -m 755 `echo $$file | $(SED) 's/\.gdb$$//'` \
+-			  $(PREFIX)$(DEVEL_PREFIX)lib; \
++			  $(PREFIX)$(DEVEL_PREFIX_LIB)lib; \
+ 		fi; \
+ 	done
+ endif