Parcourir la source

opkg: fix runtime issues

Waldemar Brodkorb il y a 6 ans
Parent
commit
8d1d490ba2
2 fichiers modifiés avec 21 ajouts et 7 suppressions
  1. 13 2
      package/libarchive/Makefile
  2. 8 5
      package/opkg/Makefile

+ 13 - 2
package/libarchive/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		3.2.2
 PKG_RELEASE:=		1
 PKG_HASH:=		691c194ee132d1f0f7a42541f091db811bc2e56f7107e9121be2bc8c04f1060f
 PKG_DESCR:=		multiformat archive and compression library
-PKG_SECTION:=		libs/misc
+PKG_SECTION:=		libs/comp
 PKG_BUILDDEP:=		xz
 PKG_URL:=		http://www.libarchive.org/
 PKG_SITES:=		http://www.libarchive.org/downloads/
@@ -23,7 +23,18 @@ $(eval $(call HOST_template,LIBARCHIVE,libarchive,$(PKG_VERSION)-$(PKG_RELEASE))
 $(eval $(call PKG_template,LIBARCHIVE,libarchive,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS)))
 
 XAKE_FLAGS+=		V=1
-CONFIGURE_ARGS+=	--without-xml2
+CONFIGURE_ARGS+=	--disable-xattr \
+			--disable-acl \
+			--without-xml2 \
+			--without-lzma \
+			--without-lzmadec \
+			--without-lz4 \
+			--without-lzo2 \
+			--without-nettle \
+			--without-openssl \
+			--without-expat \
+			--without-bz2lib \
+			--without-zlib
 
 libarchive-install:
 	$(INSTALL_DIR) $(IDIR_LIBARCHIVE)/usr/lib

+ 8 - 5
package/opkg/Makefile

@@ -8,8 +8,8 @@ PKG_VERSION:=		0.3.5
 PKG_RELEASE:=		1
 PKG_HASH:=		734bc21dea11262113fa86b928d09812618b3966f352350cf916a6ae0d343f32
 PKG_DESCR:=		embedded package manager
-PKG_DEPENDS:=		libcurl libarchive gpgme
-PKG_BUILDDEP:=		curl libarchive gpgme
+PKG_DEPENDS:=		libcurl libarchive gpgme libressl xz
+PKG_BUILDDEP:=		curl libarchive gpgme xz libressl
 HOST_BUILDDEP:=		libarchive-host curl-host
 PKG_NEEDS:=		threads
 PKG_SECTION:=		sys/misc
@@ -26,10 +26,13 @@ $(eval $(call PKG_template,OPKG,opkg,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS
 
 HOST_CONFIGURE_ARGS+=	--disable-openssl \
 			--disable-gpg \
+			--disable-xz \
 			--disable-ssl-curl
-CONFIGURE_ARGS+=	--disable-openssl \
-			--enable-gpg \
-			--disable-ssl-curl
+CONFIGURE_ARGS+=	--disable-bzip2 \
+			--enable-ssl-curl \
+			--enable-openssl \
+			--enable-xz \
+			--enable-gpg
 
 opkg-install:
 	$(INSTALL_DIR) $(IDIR_OPKG)/usr/bin