From a852234493878308a3d83200f2cdee0d92a0c9d5 Mon Sep 17 00:00:00 2001 From: Lauri Tirkkonen Date: Sun, 3 Nov 2019 19:23:13 +0200 Subject: [PATCH] zlib: change to new library paths --- components/library/zlib/Makefile | 3 +-- components/library/zlib/zlib.p5m | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/components/library/zlib/Makefile b/components/library/zlib/Makefile index 5872138da..8dfaa0923 100644 --- a/components/library/zlib/Makefile +++ b/components/library/zlib/Makefile @@ -63,9 +63,8 @@ CFLAGS += $(CFLAGS.$(BITS)) # Note that this is NOT an autoconf-generated standard configure script. CONFIGURE_OPTIONS = --shared CONFIGURE_OPTIONS += --prefix=/usr -CONFIGURE_OPTIONS.32 = +CONFIGURE_OPTIONS.32 = --libdir=/usr/lib/$(MACH32) CONFIGURE_OPTIONS.64 = --64 -CONFIGURE_OPTIONS.64 += --libdir=/usr/lib/$(MACH64) CONFIGURE_OPTIONS += $(CONFIGURE_OPTIONS.$(BITS)) build: $(BUILD_32_and_64) diff --git a/components/library/zlib/zlib.p5m b/components/library/zlib/zlib.p5m index 0512a3818..4b9bfe57e 100644 --- a/components/library/zlib/zlib.p5m +++ b/components/library/zlib/zlib.p5m @@ -37,10 +37,10 @@ set name=info.source-url value=$(COMPONENT_ARCHIVE_URL) file path=usr/include/zconf.h file path=usr/include/zlib.h -link path=usr/lib/$(MACH64)/libz.so target=libz.so.$(COMPONENT_VERSION) -file path=usr/lib/$(MACH64)/libz.so.$(COMPONENT_VERSION) -link path=usr/lib/$(MACH64)/libz.so.1 target=libz.so.$(COMPONENT_VERSION) -file path=usr/lib/$(MACH64)/pkgconfig/zlib.pc +link path=usr/lib/$(MACH32)/libz.so target=libz.so.$(COMPONENT_VERSION) +file path=usr/lib/$(MACH32)/libz.so.$(COMPONENT_VERSION) +link path=usr/lib/$(MACH32)/libz.so.1 target=libz.so.$(COMPONENT_VERSION) +file path=usr/lib/$(MACH32)/pkgconfig/zlib.pc link path=usr/lib/libz.so target=libz.so.$(COMPONENT_VERSION) file path=usr/lib/libz.so.$(COMPONENT_VERSION) link path=usr/lib/libz.so.1 target=libz.so.$(COMPONENT_VERSION) -- 2.11.4.GIT