diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-07-16 19:27:25 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-07-16 19:27:25 +0200 |
| commit | 9ff94ff55f7d3db8a010f9d629a055d3a67a1e66 (patch) | |
| tree | 795cc77e8f34f21e493abd7dcaedddc7acc275b7 /package/pcmciautils | |
| parent | 57f9ca1aa63375be959afcf70d287c871e6d8d33 (diff) | |
update and fix native build
Diffstat (limited to 'package/pcmciautils')
| -rw-r--r-- | package/pcmciautils/Makefile | 4 | ||||
| -rw-r--r-- | package/pcmciautils/patches/patch-Makefile | 23 |
2 files changed, 21 insertions, 6 deletions
diff --git a/package/pcmciautils/Makefile b/package/pcmciautils/Makefile index 9b319a1e1..1855f3ee6 100644 --- a/package/pcmciautils/Makefile +++ b/package/pcmciautils/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= pcmciautils -PKG_VERSION:= 017 +PKG_VERSION:= 018 PKG_RELEASE:= 1 -PKG_MD5SUM:= ee5837214d297661c8b8189055a351fc +PKG_MD5SUM:= 3c388cb559975b37a75cb5965e9800a9 PKG_DESCR:= Utilities for PCMCIA subsystem PKG_SECTION:= utils PKG_BUILDDEP:= sysfsutils diff --git a/package/pcmciautils/patches/patch-Makefile b/package/pcmciautils/patches/patch-Makefile index cb1f0e162..d49a761a8 100644 --- a/package/pcmciautils/patches/patch-Makefile +++ b/package/pcmciautils/patches/patch-Makefile @@ -1,6 +1,6 @@ --- pcmciautils-017.orig/Makefile 2010-01-06 16:47:45.000000000 +0100 -+++ pcmciautils-017/Makefile 2010-07-30 17:34:46.000000000 +0200 -@@ -94,12 +94,13 @@ PWD = $(shell pwd) ++++ pcmciautils-017/Makefile 2011-07-15 12:41:55.000000000 +0200 +@@ -94,16 +94,19 @@ PWD = $(shell pwd) # If you are running a cross compiler, you may want to set this # to something more interesting, like "arm-linux-". If you want # to compile vs uClibc, that can be done here as well. @@ -15,7 +15,22 @@ HOSTCC = gcc export CROSS CC AR STRIP RANLIB CFLAGS LDFLAGS LIB_OBJS ARCH_LIB_OBJS CRT0 -@@ -264,30 +265,31 @@ clean: + ++CFLAGS ?= ++ + # code taken from uClibc to determine the current arch + ARCH := ${shell $(CC) -dumpmachine | sed -e s'/-.*//' -e 's/i.86/i386/' -e 's/sparc.*/sparc/' \ + -e 's/arm.*/arm/g' -e 's/m68k.*/m68k/' -e 's/powerpc/ppc/g'} +@@ -215,7 +218,7 @@ all: ccdv $(PCCARDCTL) $(PCMCIA_CHECK_BR + ccdv: build/ccdv + build/ccdv: build/ccdv.c + @echo "Building ccdv" +- @$(HOSTCC) -O1 $< -o $@ ++ $(HOSTCC) $(CFLAGS_FOR_BUILD) -O1 $< -o $@ + + %.o : %.c ccdv + $(QUIET) $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< +@@ -264,30 +267,31 @@ clean: install-hotplug: $(INSTALL) -d $(DESTDIR)$(hotplugdir) @@ -54,7 +69,7 @@ uninstall-tools: - rm -f $(DESTDIR)$(sbindir)/$(PCCARDCTL) -@@ -296,22 +298,24 @@ uninstall-tools: +@@ -296,22 +300,24 @@ uninstall-tools: install-config: $(INSTALL) -d $(DESTDIR)$(pcmciaconfdir) |