English Language flag
// Log In
// CVSweb
Project: FreeWRT
// Summary // Activity // Search // Tracker // Lists // News // SCM // Wiki

SCM Repository

ViewVC logotype

Diff of /branches/common-nfo/package/busybox/patches/950-unportability.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 3426 by tg, Wed Jul 18 12:45:43 2007 UTC revision 3427 by tg, Wed Aug 8 11:08:41 2007 UTC
# Line 3  $FreeWRT$ Line 3  $FreeWRT$
3          collect all unportability fixes for the build          collect all unportability fixes for the build
4          system (not what ends up in the .ipk) here          system (not what ends up in the .ipk) here
5    
6  --- busybox-1.4.1/scripts/trylink.orig  2007-02-10 19:47:03.000000000 +0000          submitted as http://bugs.busybox.net/view.php?id=1438
7  +++ busybox-1.4.1/scripts/trylink       2007-02-10 19:47:10.000000000 +0000  
8  @@ -1,4 +1,4 @@  --- busybox-1.4.2/applets/Kbuild.orig   Sun Mar 18 16:59:13 2007
9  -#!/bin/sh  +++ busybox-1.4.2/applets/Kbuild        Fri Jul 20 12:08:48 2007
10  +#!/usr/bin/env bash  @@ -8,6 +8,7 @@ obj-y:=
11     obj-y  += applets.o
12     obj-y  += busybox.o
13    
14    +ifneq (${CONFIG_FEATURE_COMPRESS_USAGE},)
15     # Generated file needs additional love
16    
17     applets/applets.o: include/usage_compressed.h
18    @@ -20,3 +21,4 @@ quiet_cmd_gen_usage_compressed = GEN    
19           cmd_gen_usage_compressed = $(srctree)/applets/usage_compressed include/usage_compressed.h applets
20     include/usage_compressed.h: $(srctree)/include/usage.h applets/usage
21            $(call cmd,gen_usage_compressed)
22    +endif
23    --- busybox-1.4.2/scripts/trylink.orig  2007-07-31 20:46:00.000000000 +0200
24    +++ busybox-1.4.2/scripts/trylink       2007-07-31 20:46:15.000000000 +0200
25    @@ -2,7 +2,7 @@
26    
27   debug=false   debug=false
28    
29  --- busybox-1.4.1/applets/Kbuild.orig   Sat Mar 17 00:33:13 2007  -function try {
30  +++ busybox-1.4.1/applets/Kbuild        Sat Mar 17 00:33:39 2007  +try() {
31  @@ -7,16 +7,3 @@       added="$1"
32   obj-y:=       shift
33   obj-y  += applets.o       $debug && echo "Trying: $* $added"
  obj-y  += busybox.o  
 -  
 -# Generated file needs additional love  
 -  
 -applets/applets.o: include/usage_compressed.h  
 -  
 -hostprogs-y += usage  
 -always := $(hostprogs-y)  
 -HOSTCFLAGS_usage.o = -I$(srctree)/include  
 -  
 -quiet_cmd_gen_usage_compressed = GEN     include/usage_compressed.h  
 -      cmd_gen_usage_compressed = $(srctree)/applets/usage_compressed include/usage_compressed.h applets  
 -include/usage_compressed.h: $(srctree)/include/usage.h applets/usage  
 -       $(call cmd,gen_usage_compressed)  

Legend:
Removed from v.3426  
changed lines
  Added in v.3427

root@freewrt.org:443
ViewVC Help
Powered by ViewVC 1.1.20