diff options
| -rw-r--r-- | package/lsof/lsof-makefile.patch | 14 | ||||
| -rw-r--r-- | package/lsof/lsof-uclibc.patch | 12 | ||||
| -rw-r--r-- | package/lsof/lsof.mk | 15 |
3 files changed, 38 insertions, 3 deletions
diff --git a/package/lsof/lsof-makefile.patch b/package/lsof/lsof-makefile.patch new file mode 100644 index 000000000..df961759d --- /dev/null +++ b/package/lsof/lsof-makefile.patch @@ -0,0 +1,14 @@ +diff -ru lsof_4.77.orig/lsof_4.77_src/lib/Makefile.skel lsof_4.77/lsof_4.77_src/lib/Makefile.skel +--- lsof_4.77.orig/lsof_4.77_src/lib/Makefile.skel 2001-02-13 03:12:22.000000000 +0100 ++++ lsof_4.77/lsof_4.77_src/lib/Makefile.skel 2006-11-29 13:51:44.000000000 +0100 +@@ -21,8 +21,8 @@ + all: ${LIB} + + ${LIB}: ${OBJ} +- ${AR} +- ${RANLIB} ++ ${AR} cr ${LIB} ${OBJ} ++ ${RANLIB} ${LIB} + + clean: FRC + rm -f ${LIB} ${OBJ} errs Makefile.bak a.out core diff --git a/package/lsof/lsof-uclibc.patch b/package/lsof/lsof-uclibc.patch new file mode 100644 index 000000000..80a46da6f --- /dev/null +++ b/package/lsof/lsof-uclibc.patch @@ -0,0 +1,12 @@ +diff -ru lsof_4.77.orig/lsof_4.77_src/dialects/linux/dlsof.h lsof_4.77/lsof_4.77_src/dialects/linux/dlsof.h +--- lsof_4.77.orig/lsof_4.77_src/dialects/linux/dlsof.h 2006-03-28 00:57:14.000000000 +0200 ++++ lsof_4.77/lsof_4.77_src/dialects/linux/dlsof.h 2006-11-29 14:03:07.000000000 +0100 +@@ -49,7 +49,7 @@ + #include <unistd.h> + #include <netinet/in.h> + +-# if defined(GLIBCV) ++# if defined(GLIBCV) || defined __UCLIBC__ + #include <netinet/tcp.h> + # else /* !defined(GLIBCV) */ + #include <linux/tcp.h> diff --git a/package/lsof/lsof.mk b/package/lsof/lsof.mk index 916b464ef..dc9902f82 100644 --- a/package/lsof/lsof.mk +++ b/package/lsof/lsof.mk @@ -10,6 +10,14 @@ LSOF_DIR:=$(BUILD_DIR)/lsof_4.77 LSOF_BINARY:=lsof LSOF_TARGET_BINARY:=bin/lsof +BR2_LSOF_CFLAGS:= +ifeq ($(BR2_LARGEFILE),) +BR2_LSOF_CFLAGS+=-U_FILE_OFFSET_BITS +endif +ifeq ($(UCLIBC_HAS_IPV6),) +BR2_LSOF_CFLAGS+=-UHASIPv6 +endif + $(DL_DIR)/$(LSOF_SOURCE): $(WGET) -P $(DL_DIR) $(LSOF_SITE)/$(LSOF_SOURCE) @@ -24,14 +32,15 @@ $(LSOF_DIR)/.unpacked: $(DL_DIR)/$(LSOF_SOURCE) touch $(LSOF_DIR)/.unpacked $(LSOF_DIR)/.configured: $(LSOF_DIR)/.unpacked - (cd $(LSOF_DIR)/lsof_4.77_src; echo n | CC="$(CC)" CFLAGS="$(CFLAGS)" ./Configure linux) + (cd $(LSOF_DIR)/lsof_4.77_src; echo n | $(TARGET_CONFIGURE_OPTS) DEBUG="$(TARGET_CFLAGS) $(BR2_LSOF_CFLAGS)" ./Configure linux) touch $(LSOF_DIR)/.configured $(LSOF_DIR)/lsof_4.77_src/$(LSOF_BINARY): $(LSOF_DIR)/.configured - $(MAKE) CC=$(TARGET_CC) -C $(LSOF_DIR)/lsof_4.77_src + $(MAKE) $(TARGET_CONFIGURE_OPTS) DEBUG="$(TARGET_CFLAGS) $(BR2_LSOF_CFLAGS)" -C $(LSOF_DIR)/lsof_4.77_src $(TARGET_DIR)/$(LSOF_TARGET_BINARY): $(LSOF_DIR)/lsof_4.77_src/$(LSOF_BINARY) - cp -a $(LSOF_DIR)/lsof_4.77_src/$(LSOF_BINARY) $(TARGET_DIR)/$(LSOF_TARGET_BINARY) + cp $(LSOF_DIR)/lsof_4.77_src/$(LSOF_BINARY) $@ + $(STRIP) $@ lsof: uclibc $(TARGET_DIR)/$(LSOF_TARGET_BINARY) |