diff options
| author | Henning Heinold <heinold@inf.fu-berlin.de> | 2008-09-20 20:39:36 +0000 |
|---|---|---|
| committer | Henning Heinold <heinold@inf.fu-berlin.de> | 2008-09-20 20:39:36 +0000 |
| commit | a22e117f3963f19a4bcfb17f80eefc6c9f640285 (patch) | |
| tree | ef2036ed5a4fdaeffba7ddcb8ddb645eb18cefd7 /packages/pcmciautils/pcmciautils-015/ccdv.patch | |
| parent | d463407afaeaafa4ecae7f17437a8fcc2a06b258 (diff) | |
pcmcia-utils: update to version 0.15
* add new ccdv.patch for fixing parallel build
taken from the git-repository
Diffstat (limited to 'packages/pcmciautils/pcmciautils-015/ccdv.patch')
| -rw-r--r-- | packages/pcmciautils/pcmciautils-015/ccdv.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/packages/pcmciautils/pcmciautils-015/ccdv.patch b/packages/pcmciautils/pcmciautils-015/ccdv.patch new file mode 100644 index 0000000000..460e3938aa --- /dev/null +++ b/packages/pcmciautils/pcmciautils-015/ccdv.patch @@ -0,0 +1,34 @@ +From: Olivier Blin <blino@mandriva.com> +Date: Wed, 13 Aug 2008 20:30:14 +0000 (+0200) +Subject: fix parallel build of ccdv +X-Git-Url: http://git.kernel.org/?p=linux%2Fpcmcia%2Fpcmciautils.git;a=commitdiff_plain;h=ff72508f29567028597d8816bdf8b55c3c61a314 + +fix parallel build of ccdv + +Parallel build was broken because ccdv was not necessarily built +before the object files were built (occured with make -j4). + +Signed-off-by: Olivier Blin <blino@mandriva.com> +Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net> +--- + +diff --git a/Makefile b/Makefile +index cc30ae4..e1d7c85 100644 +--- a/Makefile ++++ b/Makefile +@@ -208,11 +208,12 @@ UDEV_RULES += udev/rules-end + + all: ccdv $(PCCARDCTL) $(PCMCIA_CHECK_BROKEN_CIS) $(PCMCIA_SOCKET_STARTUP_BUILD) udevrules + +-ccdv: ++ccdv: build/ccdv ++build/ccdv: build/ccdv.c + @echo "Building ccdv" +- @$(HOSTCC) -O1 build/ccdv.c -o build/ccdv ++ @$(HOSTCC) -O1 $< -o $@ + +-.c.o: ++%.o : %.c ccdv + $(QUIET) $(CC) $(CFLAGS) -c -o $@ $< + + %.c %.h : %.y |