Changeset bb9c424 in freewrt

Timestamp:

Jul 23, 2007, 12:22:45 PM (18 years ago)

Author:

Thorsten Glaser <tg@…>

Children:

6765c60

Parents:

8dd13f1

Message:

make this build simpler

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

Location:

package/busybox

Files:

• Makefile (modified) (1 diff)
• patches/600-missing_headers.patch (deleted)
• patches/950-unportability.patch (modified) (2 diffs)

package/busybox/Makefile

@@ -34 +34 @@
         yes '' | \
         $(MAKE) V=1 CROSS_COMPILE="$(TARGET_CROSS)" PREFIX="$(IDIR_BUSYBOX)" \
-                EXTRA_CFLAGS="$(TARGET_CFLAGS)" IPKG_ARCH="$(ARCH)" \
-                HOST_OS_IS_NOT_LINUX=1 ARCH="$(ARCH)" -C $(WRKBUILD) oldconfig
+            EXTRA_CFLAGS="$(TARGET_CFLAGS)" IPKG_ARCH="$(ARCH)" \
+            ARCH="$(ARCH)" -C $(WRKBUILD) oldconfig
 
 do-build:
         $(MAKE) V=1 CROSS_COMPILE="$(TARGET_CROSS)" PREFIX="$(IDIR_BUSYBOX)" \
-                EXTRA_CFLAGS="$(TARGET_CFLAGS)" IPKG_ARCH="$(ARCH)" \
-                HOST_OS_IS_NOT_LINUX=1 ARCH="$(ARCH)" -C $(WRKBUILD)
+            EXTRA_CFLAGS="$(TARGET_CFLAGS)" IPKG_ARCH="$(ARCH)" \
+            ARCH="$(ARCH)" -C $(WRKBUILD)
 
 do-install:
         $(MAKE) V=1 CROSS_COMPILE="$(TARGET_CROSS)" PREFIX="$(IDIR_BUSYBOX)" \
-                EXTRA_CFLAGS="$(TARGET_CFLAGS)" IPKG_ARCH="$(ARCH)" \
-                HOST_OS_IS_NOT_LINUX=1 ARCH="$(ARCH)" -C $(WRKBUILD) install
+            EXTRA_CFLAGS="$(TARGET_CFLAGS)" IPKG_ARCH="$(ARCH)" \
+            ARCH="$(ARCH)" -C $(WRKBUILD) install
         $(INSTALL_DIR) $(IDIR_BUSYBOX)/etc/init.d/
         $(INSTALL_DATA) ./files/syslog.init \
-                $(IDIR_BUSYBOX)/etc/init.d/syslog
+            $(IDIR_BUSYBOX)/etc/init.d/syslog
         $(INSTALL_DATA) ./files/network.init \
-                $(IDIR_BUSYBOX)/etc/init.d/network
+            $(IDIR_BUSYBOX)/etc/init.d/network
         $(INSTALL_DATA) ./files/crond.init \
-                $(IDIR_BUSYBOX)/etc/init.d/crond
+            $(IDIR_BUSYBOX)/etc/init.d/crond
         ${INSTALL_DIR} ${IDIR_BUSYBOX}/etc/network/plugins
         ${INSTALL_DATA} ./files/ipv6 ${IDIR_BUSYBOX}/etc/network/plugins

package/busybox/patches/950-unportability.patch

@@ -6 +6 @@
         submitted as http://bugs.busybox.net/view.php?id=1438
 
---- busybox-1.4.2/scripts/trylink.orig  Sun Mar 18 16:59:02 2007
-+++ busybox-1.4.2/scripts/trylink       Fri Jul 20 12:07:14 2007
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/usr/bin/env bash
- 
- debug=false
- 
 --- busybox-1.4.2/applets/Kbuild.orig   Sun Mar 18 16:59:13 2007
 +++ busybox-1.4.2/applets/Kbuild        Fri Jul 20 12:08:48 2007
@@ -20 +12 @@
  obj-y  += busybox.o
  
-+ifneq (${HOST_OS_IS_NOT_LINUX},)
++ifneq (${CONFIG_FEATURE_COMPRESS_USAGE},)
  # Generated file needs additional love