[PATCH] alsa-driver git repo: Build problems when copying symlink to itself

[Colin Guthrie <gmane@colin.guthr.ie>]

[-- Attachment #1: Type: text/plain, Size: 1637 bytes --]

Hi,

After doing a "simple":
git clone alsa-driver
git clone alsa-kernel
cd alsa-driver
./gitcompile --with-debug=full --with-isapnp=yes --with-sequencer=yes
--with-moddir=updates/alsa:

The build bombed out pretty quickly with the following error.

The attached patch fixes it.

Hacking autoconf.h...
make[1]: Entering directory
`/home/colin/Development/Personal/ALSA/alsa-driver/include'
make -C sound prepare
make[2]: Entering directory
`/home/colin/Development/Personal/ALSA/alsa-driver/include/sound'
make prepare2
make[3]: Entering directory
`/home/colin/Development/Personal/ALSA/alsa-driver/include/sound'
cp ../../alsa-kernel/include/ac97_codec.h .
patch -p0 -i ac97_codec.patch ac97_codec.h
patching file ac97_codec.h
Hunk #1 succeeded at 650 (offset 5 lines).
cp ../../alsa-kernel/include/core.h .
patch -p0 -i core.patch core.h
patching file core.h
cp ../../alsa-kernel/include/info.h .
cp: `../../alsa-kernel/include/info.h' and `./info.h' are the same file
make[3]: *** [info.h] Error 1
make[3]: Leaving directory
`/home/colin/Development/Personal/ALSA/alsa-driver/include/sound'
make[2]: *** [prepare] Error 2
make[2]: Leaving directory
`/home/colin/Development/Personal/ALSA/alsa-driver/include/sound'
make[1]: *** [prepare] Error 2
make[1]: Leaving directory
`/home/colin/Development/Personal/ALSA/alsa-driver/include'
make: *** [dep] Error 1

-- 

Colin Guthrie
gmane(at)colin.guthr.ie
http://colin.guthr.ie/

Day Job:
  Tribalogic Limited [http://www.tribalogic.net/]
Open Source:
  Mageia Contributor [http://www.mageia.org/]
  PulseAudio Hacker [http://www.pulseaudio.org/]
  Trac Hacker [http://trac.edgewall.org/]

[-- Attachment #2: 0001-Fix-broken-build-due-to-cp-symlink-behaviour.patch --]
[-- Type: text/x-patch, Size: 953 bytes --]

>From c8d828633824d1dc9eb1739c676fb1a8b961c523 Mon Sep 17 00:00:00 2001
From: Colin Guthrie <cguthrie@mandriva.org>
Date: Sat, 12 Mar 2011 10:28:38 +0000
Subject: [PATCH] Fix broken build due to cp+symlink behaviour

Sometimes the destination file is a symlink to the source file.
If this happens cp may complain:
 cp: ./info.h' are the same file

This patch just adds a safety rm -f before hand which wont do any harm.
---
 include/sound/Makefile |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/include/sound/Makefile b/include/sound/Makefile
index 4f3c782..f992c01 100644
--- a/include/sound/Makefile
+++ b/include/sound/Makefile
@@ -27,6 +27,7 @@ version.h: ../version.h
 		b=$$(basename $$s .h); \
 		if test -f $$b.patch; then \
 			echo "$$s: $$i $$b.patch" >> $@; \
+			echo "	rm -f \$$@" >> $@; \
 			echo "	cp \$$(INCSRC)/\$$@ ." >> $@; \
 			echo "	patch -p0 -i $$b.patch \$$@" >> $@; \
 			echo >> $@; \
-- 
1.7.4.1


[-- Attachment #3: Type: text/plain, Size: 160 bytes --]

_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel