Changeset 3c1438a in freewrt

Timestamp:

May 22, 2007, 4:50:19 PM (19 years ago)

Author:

Thorsten Glaser <tg@…>

Children:

337b581

Parents:

5e15178

Message:

• do not create statically linked binaries – size issues…
• do not create multiple copies of the same file, use links

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@2608 afb5a338-a214-0410-bd46-81f09a774fd1

Location:

package/procps

Files:

• Makefile (modified) (3 diffs)
• patches/patch-Makefile (modified) (2 diffs)

package/procps/Makefile

@@ -9 +9 @@
 PKG_NAME:=              procps
 PKG_VERSION:=           3.2.7
-PKG_RELEASE:=           2
+PKG_RELEASE:=           3
 PKG_MD5SUM:=            f490bca772b16472962c7b9f23b1e97d
 PKG_SOURCE_URL:=        http://procps.sourceforge.net/
@@ -19 +19 @@
 BUILD_STYLE:=           auto
 INSTALL_STYLE:=         auto
-XAKE_FLAGS+=            CC="${TARGET_CC}" \
-                        CFLAGS="${TCFLAGS} -static" \
-                        CPPFLAGS="-I${STAGING_DIR}/usr/include" \
-                        LDFLAGS="${TLDFLAGS} -L${WRKBUILD}/lib -static"
 
 post-install:
-        ${INSTALL_DIR} ${IDIR_PROCPS}/usr/bin
+        ${INSTALL_DIR} ${IDIR_PROCPS}/{bin,sbin,usr/bin}
         ${INSTALL_BIN} ${WRKINST}/usr/bin/uptime ${IDIR_PROCPS}/usr/bin
         ${INSTALL_BIN} ${WRKINST}/usr/bin/tload ${IDIR_PROCPS}/usr/bin
@@ -33 +29 @@
         ${INSTALL_BIN} ${WRKINST}/usr/bin/vmstat ${IDIR_PROCPS}/usr/bin
         ${INSTALL_BIN} ${WRKINST}/usr/bin/watch ${IDIR_PROCPS}/usr/bin
-        ${INSTALL_BIN} ${WRKINST}/usr/bin/skill ${IDIR_PROCPS}/usr/bin
-        ${INSTALL_BIN} ${WRKINST}/usr/bin/snice ${IDIR_PROCPS}/usr/bin
         ${INSTALL_BIN} ${WRKINST}/usr/bin/pmap ${IDIR_PROCPS}/usr/bin
         ${INSTALL_BIN} ${WRKINST}/usr/bin/pgrep ${IDIR_PROCPS}/usr/bin
-        ${INSTALL_BIN} ${WRKINST}/usr/bin/pkill ${IDIR_PROCPS}/usr/bin
         ${INSTALL_BIN} ${WRKINST}/usr/bin/slabtop ${IDIR_PROCPS}/usr/bin
         ${INSTALL_BIN} ${WRKINST}/usr/bin/pwdx ${IDIR_PROCPS}/usr/bin
-        ${INSTALL_DIR} ${IDIR_PROCPS}/bin
         ${INSTALL_BIN} ${WRKINST}/bin/kill ${IDIR_PROCPS}/bin
         ${INSTALL_BIN} ${WRKINST}/bin/ps ${IDIR_PROCPS}/bin
-        ${INSTALL_DIR} ${IDIR_PROCPS}/sbin
         ${INSTALL_BIN} ${WRKINST}/sbin/sysctl ${IDIR_PROCPS}/sbin
+        cd ${IDIR_PROCPS}/usr/bin; \
+            ln -sf ../../bin/kill skill; \
+            ln -sf ../../bin/kill snice; \
+            ln -sf pgrep pkill
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/procps/patches/patch-Makefile

@@ -1 +1 @@
 $FreeWRT$
-
-        install(1) doesn't have a -D option
-
 --- procps-3.2.7.orig/Makefile  Sat Jun 24 09:02:02 2006
-+++ procps-3.2.7/Makefile       Tue May 22 14:28:43 2007
++++ procps-3.2.7/Makefile       Tue May 22 14:43:11 2007
 @@ -27,7 +27,7 @@ TARVERSION   := $(VERSION).$(SUBVERSION)
  ldconfig := ldconfig
@@ -14 +11 @@
  # Lame x86-64 /lib64 and /usr/lib64 abomination:
  lib64    := lib$(shell [ -d /lib64 ] && echo 64)
+@@ -82,7 +82,7 @@ CURSES := -lncurses
+ 
+ # Preprocessor flags.
+ PKG_CPPFLAGS := -D_GNU_SOURCE -I proc
+-CPPFLAGS     := -I/usr/include/ncurses
++CPPFLAGS     ?= -I/usr/include/ncurses
+ ALL_CPPFLAGS := $(PKG_CPPFLAGS) $(CPPFLAGS)
+ 
+ # Left out -Wconversion due to noise in glibc headers.
+@@ -102,11 +102,11 @@ PKG_CFLAGS   := -fno-common -ffast-math 
+   -Wstrict-prototypes -Wmissing-prototypes
+ # Note that some stuff below is conditional on CFLAGS containing
+ # an option that starts with "-g". (-g, -g2, -g3, -ggdb, etc.)
+-CFLAGS       := -O2 -s
++CFLAGS       ?= -O2 -s
+ ALL_CFLAGS   := $(PKG_CFLAGS) $(CFLAGS)
+ 
+ PKG_LDFLAGS  := -Wl,-warn-common
+-LDFLAGS      :=
++LDFLAGS      ?=
+ ALL_LDFLAGS  := $(PKG_LDFLAGS) $(LDFLAGS)
+ 
+ ############ Add some extra flags if gcc allows
+@@ -128,7 +128,7 @@ check_gcc = $(shell if $(CC) $(ALL_CPPFL
+ # i386 and x86-64, mips and mips64, sparc and sparc64, and so on.
+ # Failure to do so will cause data corruption.
+ m64 := $(call check_gcc,-m64,$(call check_gcc,-mabi=64,))
+-ALL_CFLAGS += $(m64)
++#ALL_CFLAGS += $(m64)
+ 
+ ALL_CFLAGS += $(call check_gcc,-Wdeclaration-after-statement,)
+ ALL_CFLAGS += $(call check_gcc,-Wpadded,)
 @@ -222,10 +222,16 @@ clean:
  ###### install