From: Felix Fietkau <nbd@nbd.name>
Date: Sun, 28 Aug 2016 12:33:48 +0000 (+0200)
Subject: opkg: disable the use of vfork for the host build
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=02e3c718e9ad0c14aa3cf359ba2a4763e81df805;p=openwrt%2Fstaging%2Fjow.git

opkg: disable the use of vfork for the host build

Signed-off-by: Felix Fietkau <nbd@nbd.name>
---

diff --git a/package/system/opkg/Makefile b/package/system/opkg/Makefile
index 67ceb7cafc..446463ec85 100644
--- a/package/system/opkg/Makefile
+++ b/package/system/opkg/Makefile
@@ -109,7 +109,7 @@ endef
 
 Package/opkg-smime/conffiles = $(Package/opkg/conffiles)
 
-TARGET_CFLAGS += -ffunction-sections -fdata-sections
+TARGET_CFLAGS += -ffunction-sections -fdata-sections -DOPKG_USE_VFORK=1
 EXTRA_CFLAGS += $(TARGET_CPPFLAGS)
 
 CONFIGURE_ARGS += \
diff --git a/package/system/opkg/patches/280-use-vfork.patch b/package/system/opkg/patches/280-use-vfork.patch
index 1c46f52b02..fc6058a701 100644
--- a/package/system/opkg/patches/280-use-vfork.patch
+++ b/package/system/opkg/patches/280-use-vfork.patch
@@ -1,20 +1,25 @@
 --- a/libbb/gz_open.c
 +++ b/libbb/gz_open.c
-@@ -29,7 +29,7 @@
+@@ -29,7 +29,12 @@
  #include <unistd.h>
  #include "libbb.h"
  
--static int gz_use_vfork;
-+static const int gz_use_vfork = 1;
++#ifdef OPKG_USE_VFORK
++static const int gz_use_vfork = OPKG_USE_VFORK;
++#else
+ static int gz_use_vfork;
++#endif
++
  
  FILE *
  gz_open(FILE *compressed_file, int *pid)
-@@ -38,8 +38,6 @@ gz_open(FILE *compressed_file, int *pid)
+@@ -38,7 +43,9 @@ gz_open(FILE *compressed_file, int *pid)
  	off_t floc;
  	int cfile = -1;
  
--	gz_use_vfork = (getenv("OPKG_USE_VFORK") != NULL);
--
++#ifndef OPKG_USE_VFORK
+ 	gz_use_vfork = (getenv("OPKG_USE_VFORK") != NULL);
++#endif
+ 
  	if (gz_use_vfork) {
  		/* Create a new file descriptor for the input stream
- 		 * (it *must* be associated with a file), and lseek()