summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
2ca0cdb)
This reverts commit
02e3c718e9ad0c14aa3cf359ba2a4763e81df805.
Currently the vfork() code path in opkg is broken and relies on unsupported
ftello() / fseeko() operations on pipes - we need to restructure the code
before we can reconsider this approach.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Package/opkg-smime/conffiles = $(Package/opkg/conffiles)
Package/opkg-smime/conffiles = $(Package/opkg/conffiles)
-TARGET_CFLAGS += -ffunction-sections -fdata-sections -DOPKG_USE_VFORK=1
+TARGET_CFLAGS += -ffunction-sections -fdata-sections
EXTRA_CFLAGS += $(TARGET_CPPFLAGS)
CONFIGURE_ARGS += \
EXTRA_CFLAGS += $(TARGET_CPPFLAGS)
CONFIGURE_ARGS += \
--- a/libbb/gz_open.c
+++ b/libbb/gz_open.c
--- a/libbb/gz_open.c
+++ b/libbb/gz_open.c
#include <unistd.h>
#include "libbb.h"
#include <unistd.h>
#include "libbb.h"
-+#ifdef OPKG_USE_VFORK
-+static const int gz_use_vfork = OPKG_USE_VFORK;
-+#else
- static int gz_use_vfork;
-+#endif
-+
+-static int gz_use_vfork;
++static const int gz_use_vfork = 1;
FILE *
gz_open(FILE *compressed_file, int *pid)
FILE *
gz_open(FILE *compressed_file, int *pid)
-@@ -38,7 +43,9 @@ gz_open(FILE *compressed_file, int *pid)
+@@ -38,8 +38,6 @@ gz_open(FILE *compressed_file, int *pid)
off_t floc;
int cfile = -1;
off_t floc;
int cfile = -1;
-+#ifndef OPKG_USE_VFORK
- gz_use_vfork = (getenv("OPKG_USE_VFORK") != NULL);
-+#endif
-
+- gz_use_vfork = (getenv("OPKG_USE_VFORK") != NULL);
+-
if (gz_use_vfork) {
/* Create a new file descriptor for the input stream
if (gz_use_vfork) {
/* Create a new file descriptor for the input stream
+ * (it *must* be associated with a file), and lseek()