diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
| commit | fb6cd4f4dff71a803ba9db7751ade84fa6eac3a8 (patch) | |
| tree | 379626b7b419ac1643131a7b8ac07e9fb87b9f80 /package/microperl/patches/patch-Makefile_micro | |
| parent | 5157a34410fe9eff94d5de7100cbc3659d6c4fcb (diff) | |
| parent | ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (diff) | |
Merge branch 'master' of ssh://openadk.org/git/openadk
resolve conflicts
Conflicts:
mk/pkg-bottom.mk
package/ctorrent/Makefile
package/gcc/Makefile
package/gmp/Makefile
package/id3lib/Makefile
package/libelf/Makefile
package/libnl/patches/patch-include_netlink-local_h
package/mpd/Makefile
package/nmap/Makefile
package/rrs/Makefile
package/weechat/Makefile
scripts/rstrip.sh
target/Config.in
Diffstat (limited to 'package/microperl/patches/patch-Makefile_micro')
| -rw-r--r-- | package/microperl/patches/patch-Makefile_micro | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/package/microperl/patches/patch-Makefile_micro b/package/microperl/patches/patch-Makefile_micro new file mode 100644 index 000000000..47e8fccc0 --- /dev/null +++ b/package/microperl/patches/patch-Makefile_micro @@ -0,0 +1,15 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- perl-5.10.0.orig/Makefile.micro 2007-12-18 11:47:07.000000000 +0100 ++++ perl-5.10.0/Makefile.micro 2009-05-30 11:47:02.610977016 +0200 +@@ -177,9 +177,9 @@ uudmap.h: generate_uudmap$(_X) + $(RUN) ./generate_uudmap$(_X) >uudmap.h + + generate_uudmap$(_O): generate_uudmap.c +- $(CC) $(CCFLAGS) -o $@ $(CFLAGS) generate_uudmap.c ++ $(HOSTCC) $(CCFLAGS) -o $@ $(HOSTCFLAGS) generate_uudmap.c + + generate_uudmap$(_X): generate_uudmap$(_O) +- $(LD) -o generate_uudmap $(LDFLAGS) generate_uudmap$(_O) $(LIBS) ++ $(HOSTCC) -o generate_uudmap $(HOSTLDFLAGS) generate_uudmap$(_O) $(LIBS) + + # That's it, folks! |