* [Buildroot] [PATCH] package/crosstool-ng: update to 1.17.0
From: Carsten Schoenert @ 2012-12-09 21:18 UTC (permalink / raw)
To: buildroot
In-Reply-To: <201212092137.46147.yann.morin.1998@free.fr>
Hello Yann, Hello Peter,
Am 09.12.2012 21:37, schrieb Yann E. MORIN:
>> Unfortunately it doesn't seem to build here (ppl compilation issue):
>>
>> [ERROR] /home/peko/source/buildroot/testctng/build/build-toolchain/.build/src/ppl-0.10.2/src/Interval.defs.hh:451:86: error: 'f_info' was not declared in this scope, and no declarations were found by argument-dependent lookup at the point of instantiation [-fpermissive]
>> [ALL ] In file included from /home/peko/source/buildroot/testctng/build/build-toolchain/.build/src/ppl-0.10.2/src/Interval.defs.hh:980:0
>>
>> Yann, Carsten - Any ideas? Googling around seems to suggest that this is
>> related to a host-gcc 4.7.x issue, but people are quite likely to be
>> using that nowadays, so what to do? Build with -fpermissive?
I remember I ran into similar problems with ppl-010.2 while I try to
find a setup for a arm crosscompiler with gcc4.7.1. After choosing
ppl-0.11.2 and setting the switch -fpermissive the build was successful
(but of course with a lot warnings while global settings for LDFLAGS).
> Yes, it requires -fpermissive to build with gcc-4.7.
Right, GCC greater 4.6 are more strict while syntax checking, so without
-fpermissive actual compiler in Debian wheezy will give up. But for me
is setting -fpermisse just a temporaly solution. Newer GCCs will always
give up in such cases and that's correct.
> I am using a Debian squeeze that has a gcc-4.4, so I can't test it.
> I'll try in a wheezy chroot soonish.
No need for that. :-)
Wheezy use the current GCC 4.7.2 and the sources need a patch to correct
the source or the switch -fpermissive.
Because I don't know exactly how to patch the source (I don't have take
a deep look into it) or the Makefile for ppl-0.1x.x inside the
crosstool-ng environment I can't provide some useful right now.
--
Regards
Carsten
^ permalink raw reply
* [Buildroot] [PATCH 12/51] package/slirp: new package
From: Yann E. MORIN @ 2012-12-09 21:20 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20121209194223.439bff79@skate>
Thomas, All,
On Sunday 09 December 2012 Thomas Petazzoni wrote:
> Dear Yann E. MORIN,
>
> On Sun, 9 Dec 2012 17:34:45 +0100, Yann E. MORIN wrote:
> > +# Note: The license file 'COPYRIGHT' is missing from the sources,
> > +# although some files refer to it.
> > +SLIRP_INSTALL_STAGING = YES
> > +SLIRP_AUTORECONF = YES
>
> Justification for the _AUTORECONF=YES here?
There's no release tarball, so we're using the git tree, so there's no
./configure, so we need to autoreconf.
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply
* [Buildroot] [PATCH 12/51] package/slirp: new package
From: Yann E. MORIN @ 2012-12-09 21:37 UTC (permalink / raw)
To: buildroot
In-Reply-To: <201212092220.26330.yann.morin.1998@free.fr>
Thomas, All,
On Sunday 09 December 2012 Yann E. MORIN wrote:
> On Sunday 09 December 2012 Thomas Petazzoni wrote:
> > Dear Yann E. MORIN,
> >
> > On Sun, 9 Dec 2012 17:34:45 +0100, Yann E. MORIN wrote:
> > > +# Note: The license file 'COPYRIGHT' is missing from the sources,
> > > +# although some files refer to it.
> > > +SLIRP_INSTALL_STAGING = YES
> > > +SLIRP_AUTORECONF = YES
> >
> > Justification for the _AUTORECONF=YES here?
>
> There's no release tarball, so we're using the git tree, so there's no
> ./configure, so we need to autoreconf.
Of course, I've added a comment in slirp.mk to explain that, too.
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply
* [Buildroot] [PATCH] sane-backends: fix documentation build failure
From: Gustavo Zacarias @ 2012-12-09 21:43 UTC (permalink / raw)
To: buildroot
In-Reply-To: <87vccbvu3b.fsf@dell.be.48ers.dk>
On 12/09/2012 05:39 PM, Peter Korsgaard wrote:
> Did you have a look at moving to 1.0.23 instead?
Not really, i don't have a scanner handy for testing, so it would be
just a blind build test.
Also it's unlikely it would have fixed the documentation issue.
Regards.
^ permalink raw reply
* [Buildroot] [PATCH 21/51] package/libedit2: new package
From: Yann E. MORIN @ 2012-12-09 21:45 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20121209195205.7fb4b643@skate>
Thomas, All,
On Sunday 09 December 2012 Thomas Petazzoni wrote:
> On Sun, 9 Dec 2012 17:34:54 +0100, Yann E. MORIN wrote:
>
> > +LIBEDIT2_DEPENDENCIES = host-pmake libbsd ncurses
> If I'm correct, this package is the only one that needs host-pmake, no?
Yes, so far.
I also do not have any local change that adds another package which
depends on pmake.
> If so, then seeing how simple libedit seems to be, I think a patch
> adding a proper configure.ac + Makefile.am to libedit2, making its
> build system correct, and independent of pmake, would be in fact a lot
> easier.
Well, I've had a quick look, and it's not that easy.
For one, the Makefile has dirty dependencies on generated headers.
I'm afraid adding a configure.ac and Makefile.am will not be as
straightforward as we may think, but I'll try to do it.
> It would avoid the huge pmake package that has gazillions of patches,
> and would avoid the horrible mess in libedit2.mk to get the
> installation step correct.
Yes, pmake is ugly. :-(
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply
* [Buildroot] [PATCH] rt-tests: fix typo in Config.in threads negative logic
From: Gustavo Zacarias @ 2012-12-09 21:48 UTC (permalink / raw)
To: buildroot
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/rt-tests/Config.in | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/package/rt-tests/Config.in b/package/rt-tests/Config.in
index c253339..0999ebf 100644
--- a/package/rt-tests/Config.in
+++ b/package/rt-tests/Config.in
@@ -17,4 +17,4 @@ config BR2_PACKAGE_RT_TESTS
http://rt.wiki.kernel.org
comment "rt-tests requires a toolchain with threads support"
- !BR2_TOOLCHAIN_HAS_THREADS
+ depends on !BR2_TOOLCHAIN_HAS_THREADS
--
1.7.8.6
^ permalink raw reply related
* [Buildroot] [PATCH 1/2] powerpc: update processor types
From: Gustavo Zacarias @ 2012-12-09 21:54 UTC (permalink / raw)
To: buildroot
Update the powerpc processor types.
Remove the 801, it's the original IBM experimental implementation.
Add the 464, 464fp, 476 and 476fp cores.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
arch/Config.in.powerpc | 15 ++++++++++++---
toolchain/gcc/Config.in | 4 ++--
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/arch/Config.in.powerpc b/arch/Config.in.powerpc
index 693246b..8643efc 100644
--- a/arch/Config.in.powerpc
+++ b/arch/Config.in.powerpc
@@ -18,6 +18,14 @@ config BR2_powerpc_440
bool "440"
config BR2_powerpc_440fp
bool "440 with FPU"
+config BR2_powerpc_464
+ bool "464"
+config BR2_powerpc_464fp
+ bool "464 with FPU"
+config BR2_powerpc_476
+ bool "476"
+config BR2_powerpc_476fp
+ bool "476 with FPU"
config BR2_powerpc_505
bool "505"
config BR2_powerpc_601
@@ -44,8 +52,6 @@ config BR2_powerpc_7450
bool "7450"
config BR2_powerpc_750
bool "750"
-config BR2_powerpc_801
- bool "801"
config BR2_powerpc_821
bool "821"
config BR2_powerpc_823
@@ -95,6 +101,10 @@ config BR2_GCC_TARGET_TUNE
default "405fp" if BR2_powerpc_405fp
default "440" if BR2_powerpc_440
default "440fp" if BR2_powerpc_440fp
+ default "464" if BR2_powerpc_464
+ default "464fp" if BR2_powerpc_464fp
+ default "476" if BR2_powerpc_476
+ default "476fp" if BR2_powerpc_476fp
default "505" if BR2_powerpc_505
default "601" if BR2_powerpc_601
default "602" if BR2_powerpc_602
@@ -108,7 +118,6 @@ config BR2_GCC_TARGET_TUNE
default "7400" if BR2_powerpc_7400
default "7450" if BR2_powerpc_7450
default "750" if BR2_powerpc_750
- default "801" if BR2_powerpc_801
default "821" if BR2_powerpc_821
default "823" if BR2_powerpc_823
default "860" if BR2_powerpc_860
diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 6456502..de79452 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -15,11 +15,11 @@ choice
bool "gcc 4.2.2-avr32-2.1.5"
config BR2_GCC_VERSION_4_3_X
- depends on !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 && !BR2_cortex_a8 && !BR2_cortex_a9 && !BR2_x86_atom && !BR2_powerpc_e300c2 && !BR2_powerpc_e300c3 && !BR2_powerpc_e500mc
+ depends on !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 && !BR2_cortex_a8 && !BR2_cortex_a9 && !BR2_x86_atom && !BR2_powerpc_e300c2 && !BR2_powerpc_e300c3 && !BR2_powerpc_e500mc && !BR2_powerpc_464 && !BR2_powerpc_464fp && !BR2_powerpc_476 && !BR2_powerpc_476fp
bool "gcc 4.3.x"
config BR2_GCC_VERSION_4_4_X
- depends on !BR2_avr32 && !BR2_x86_atom
+ depends on !BR2_avr32 && !BR2_x86_atom && !BR2_powerpc_476 && !BR2_powerpc_476fp
bool "gcc 4.4.x"
config BR2_GCC_VERSION_4_5_X
--
1.7.8.6
^ permalink raw reply related
* [Buildroot] [PATCH 2/2] arm: update processor types
From: Gustavo Zacarias @ 2012-12-09 21:54 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1355090043-12326-1-git-send-email-gustavo@zacarias.com.ar>
Update the arm processor types: add the cortex A5 & A15 variants.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
arch/Config.in.arm | 8 ++++++++
toolchain/gcc/Config.in | 6 +++---
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/arch/Config.in.arm b/arch/Config.in.arm
index 6e5d258..b65b4ac 100644
--- a/arch/Config.in.arm
+++ b/arch/Config.in.arm
@@ -29,10 +29,14 @@ config BR2_arm1176jz_s
bool "arm1176jz-s"
config BR2_arm1176jzf_s
bool "arm1176jzf-s"
+config BR2_cortex_a5
+ bool "cortex-A5"
config BR2_cortex_a8
bool "cortex-A8"
config BR2_cortex_a9
bool "cortex-A9"
+config BR2_cortex_a15
+ bool "cortex-A15"
config BR2_sa110
bool "sa110"
config BR2_sa1100
@@ -83,8 +87,10 @@ config BR2_GCC_TARGET_TUNE
default "arm1136jf-s" if BR2_arm1136jf_s
default "arm1176jz-s" if BR2_arm1176jz_s
default "arm1176jzf-s" if BR2_arm1176jzf_s
+ default "cortex-a5" if BR2_cortex_a5
default "cortex-a8" if BR2_cortex_a8
default "cortex-a9" if BR2_cortex_a9
+ default "cortex-a15" if BR2_cortex_a15
default "strongarm110" if BR2_sa110
default "strongarm1100" if BR2_sa1100
default "xscale" if BR2_xscale
@@ -102,8 +108,10 @@ config BR2_GCC_TARGET_ARCH
default "armv6j" if BR2_arm1136jf_s
default "armv6zk" if BR2_arm1176jz_s
default "armv6zk" if BR2_arm1176jzf_s
+ default "armv7-a" if BR2_cortex_a5
default "armv7-a" if BR2_cortex_a8
default "armv7-a" if BR2_cortex_a9
+ default "armv7-a" if BR2_cortex_a15
default "armv4" if BR2_sa110
default "armv4" if BR2_sa1100
default "armv5te" if BR2_xscale
diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index de79452..d16e7b0 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -15,15 +15,15 @@ choice
bool "gcc 4.2.2-avr32-2.1.5"
config BR2_GCC_VERSION_4_3_X
- depends on !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 && !BR2_cortex_a8 && !BR2_cortex_a9 && !BR2_x86_atom && !BR2_powerpc_e300c2 && !BR2_powerpc_e300c3 && !BR2_powerpc_e500mc && !BR2_powerpc_464 && !BR2_powerpc_464fp && !BR2_powerpc_476 && !BR2_powerpc_476fp
+ depends on !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 && !BR2_cortex_a5 && !BR2_cortex_a8 && !BR2_cortex_a9 && !BR2_cortex_a15 && !BR2_x86_atom && !BR2_powerpc_e300c2 && !BR2_powerpc_e300c3 && !BR2_powerpc_e500mc && !BR2_powerpc_464 && !BR2_powerpc_464fp && !BR2_powerpc_476 && !BR2_powerpc_476fp
bool "gcc 4.3.x"
config BR2_GCC_VERSION_4_4_X
- depends on !BR2_avr32 && !BR2_x86_atom && !BR2_powerpc_476 && !BR2_powerpc_476fp
+ depends on !BR2_avr32 && !BR2_cortex_a5 && !BR2_cortex_a15 && !BR2_x86_atom && !BR2_powerpc_476 && !BR2_powerpc_476fp
bool "gcc 4.4.x"
config BR2_GCC_VERSION_4_5_X
- depends on !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8
+ depends on !BR2_avr32 && !BR2_cortex_a15 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8
bool "gcc 4.5.x"
config BR2_GCC_VERSION_4_6_X
--
1.7.8.6
^ permalink raw reply related
* [Buildroot] [git commit] rt-tests: fix typo in Config.in threads negative logic
From: Peter Korsgaard @ 2012-12-09 22:03 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=e510b0fea65cf6e71c6e9c512204b04282973d43
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
package/rt-tests/Config.in | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/package/rt-tests/Config.in b/package/rt-tests/Config.in
index c253339..0999ebf 100644
--- a/package/rt-tests/Config.in
+++ b/package/rt-tests/Config.in
@@ -17,4 +17,4 @@ config BR2_PACKAGE_RT_TESTS
http://rt.wiki.kernel.org
comment "rt-tests requires a toolchain with threads support"
- !BR2_TOOLCHAIN_HAS_THREADS
+ depends on !BR2_TOOLCHAIN_HAS_THREADS
^ permalink raw reply related
* [Buildroot] [PATCH] rt-tests: fix typo in Config.in threads negative logic
From: Peter Korsgaard @ 2012-12-09 22:04 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1355089725-12019-1-git-send-email-gustavo@zacarias.com.ar>
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:
Gustavo> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Argh, committed - Thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [PATCH 20/51] package/libbsd: new package
From: Yann E. MORIN @ 2012-12-09 22:06 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20121209194627.04720a09@skate>
Thomas, All,
On Sunday 09 December 2012 Thomas Petazzoni wrote:
> On Sun, 9 Dec 2012 17:34:53 +0100, Yann E. MORIN wrote:
>
> > +LIBBSD_AUTORECONF = YES
> > +LIBBSD_AUTORECONF_OPT = -f -i
>
> Justification for AUTORECONF?
Hmmm... I remember that I needed to explicitly specify the autoreconf
flags, or the standard autoreconf would not work. However, I don't
remember why autoreconf was needed in the first place...
I removed it, and it still builds OK.
I'll redo a complete build of the stack with this change, to see if it
has impacts further down along the line...
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply
* [Buildroot] [git commit] powerpc: update processor types
From: Peter Korsgaard @ 2012-12-09 22:07 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=1291304d7e482ef557cae34042488d0f714bf201
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Update the powerpc processor types.
Remove the 801, it's the original IBM experimental implementation.
Add the 464, 464fp, 476 and 476fp cores.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
arch/Config.in.powerpc | 15 ++++++++++++---
toolchain/gcc/Config.in | 4 ++--
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/arch/Config.in.powerpc b/arch/Config.in.powerpc
index 693246b..8643efc 100644
--- a/arch/Config.in.powerpc
+++ b/arch/Config.in.powerpc
@@ -18,6 +18,14 @@ config BR2_powerpc_440
bool "440"
config BR2_powerpc_440fp
bool "440 with FPU"
+config BR2_powerpc_464
+ bool "464"
+config BR2_powerpc_464fp
+ bool "464 with FPU"
+config BR2_powerpc_476
+ bool "476"
+config BR2_powerpc_476fp
+ bool "476 with FPU"
config BR2_powerpc_505
bool "505"
config BR2_powerpc_601
@@ -44,8 +52,6 @@ config BR2_powerpc_7450
bool "7450"
config BR2_powerpc_750
bool "750"
-config BR2_powerpc_801
- bool "801"
config BR2_powerpc_821
bool "821"
config BR2_powerpc_823
@@ -95,6 +101,10 @@ config BR2_GCC_TARGET_TUNE
default "405fp" if BR2_powerpc_405fp
default "440" if BR2_powerpc_440
default "440fp" if BR2_powerpc_440fp
+ default "464" if BR2_powerpc_464
+ default "464fp" if BR2_powerpc_464fp
+ default "476" if BR2_powerpc_476
+ default "476fp" if BR2_powerpc_476fp
default "505" if BR2_powerpc_505
default "601" if BR2_powerpc_601
default "602" if BR2_powerpc_602
@@ -108,7 +118,6 @@ config BR2_GCC_TARGET_TUNE
default "7400" if BR2_powerpc_7400
default "7450" if BR2_powerpc_7450
default "750" if BR2_powerpc_750
- default "801" if BR2_powerpc_801
default "821" if BR2_powerpc_821
default "823" if BR2_powerpc_823
default "860" if BR2_powerpc_860
diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 6456502..de79452 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -15,11 +15,11 @@ choice
bool "gcc 4.2.2-avr32-2.1.5"
config BR2_GCC_VERSION_4_3_X
- depends on !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 && !BR2_cortex_a8 && !BR2_cortex_a9 && !BR2_x86_atom && !BR2_powerpc_e300c2 && !BR2_powerpc_e300c3 && !BR2_powerpc_e500mc
+ depends on !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 && !BR2_cortex_a8 && !BR2_cortex_a9 && !BR2_x86_atom && !BR2_powerpc_e300c2 && !BR2_powerpc_e300c3 && !BR2_powerpc_e500mc && !BR2_powerpc_464 && !BR2_powerpc_464fp && !BR2_powerpc_476 && !BR2_powerpc_476fp
bool "gcc 4.3.x"
config BR2_GCC_VERSION_4_4_X
- depends on !BR2_avr32 && !BR2_x86_atom
+ depends on !BR2_avr32 && !BR2_x86_atom && !BR2_powerpc_476 && !BR2_powerpc_476fp
bool "gcc 4.4.x"
config BR2_GCC_VERSION_4_5_X
^ permalink raw reply related
* [Buildroot] [git commit] arm: update processor types
From: Peter Korsgaard @ 2012-12-09 22:07 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=10d042ad34b0741447e6da28631715ea362df631
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Update the arm processor types: add the cortex A5 & A15 variants.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
arch/Config.in.arm | 8 ++++++++
toolchain/gcc/Config.in | 6 +++---
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/arch/Config.in.arm b/arch/Config.in.arm
index 6e5d258..b65b4ac 100644
--- a/arch/Config.in.arm
+++ b/arch/Config.in.arm
@@ -29,10 +29,14 @@ config BR2_arm1176jz_s
bool "arm1176jz-s"
config BR2_arm1176jzf_s
bool "arm1176jzf-s"
+config BR2_cortex_a5
+ bool "cortex-A5"
config BR2_cortex_a8
bool "cortex-A8"
config BR2_cortex_a9
bool "cortex-A9"
+config BR2_cortex_a15
+ bool "cortex-A15"
config BR2_sa110
bool "sa110"
config BR2_sa1100
@@ -83,8 +87,10 @@ config BR2_GCC_TARGET_TUNE
default "arm1136jf-s" if BR2_arm1136jf_s
default "arm1176jz-s" if BR2_arm1176jz_s
default "arm1176jzf-s" if BR2_arm1176jzf_s
+ default "cortex-a5" if BR2_cortex_a5
default "cortex-a8" if BR2_cortex_a8
default "cortex-a9" if BR2_cortex_a9
+ default "cortex-a15" if BR2_cortex_a15
default "strongarm110" if BR2_sa110
default "strongarm1100" if BR2_sa1100
default "xscale" if BR2_xscale
@@ -102,8 +108,10 @@ config BR2_GCC_TARGET_ARCH
default "armv6j" if BR2_arm1136jf_s
default "armv6zk" if BR2_arm1176jz_s
default "armv6zk" if BR2_arm1176jzf_s
+ default "armv7-a" if BR2_cortex_a5
default "armv7-a" if BR2_cortex_a8
default "armv7-a" if BR2_cortex_a9
+ default "armv7-a" if BR2_cortex_a15
default "armv4" if BR2_sa110
default "armv4" if BR2_sa1100
default "armv5te" if BR2_xscale
diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index de79452..d16e7b0 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -15,15 +15,15 @@ choice
bool "gcc 4.2.2-avr32-2.1.5"
config BR2_GCC_VERSION_4_3_X
- depends on !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 && !BR2_cortex_a8 && !BR2_cortex_a9 && !BR2_x86_atom && !BR2_powerpc_e300c2 && !BR2_powerpc_e300c3 && !BR2_powerpc_e500mc && !BR2_powerpc_464 && !BR2_powerpc_464fp && !BR2_powerpc_476 && !BR2_powerpc_476fp
+ depends on !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 && !BR2_cortex_a5 && !BR2_cortex_a8 && !BR2_cortex_a9 && !BR2_cortex_a15 && !BR2_x86_atom && !BR2_powerpc_e300c2 && !BR2_powerpc_e300c3 && !BR2_powerpc_e500mc && !BR2_powerpc_464 && !BR2_powerpc_464fp && !BR2_powerpc_476 && !BR2_powerpc_476fp
bool "gcc 4.3.x"
config BR2_GCC_VERSION_4_4_X
- depends on !BR2_avr32 && !BR2_x86_atom && !BR2_powerpc_476 && !BR2_powerpc_476fp
+ depends on !BR2_avr32 && !BR2_cortex_a5 && !BR2_cortex_a15 && !BR2_x86_atom && !BR2_powerpc_476 && !BR2_powerpc_476fp
bool "gcc 4.4.x"
config BR2_GCC_VERSION_4_5_X
- depends on !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8
+ depends on !BR2_avr32 && !BR2_cortex_a15 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8
bool "gcc 4.5.x"
config BR2_GCC_VERSION_4_6_X
^ permalink raw reply related
* [Buildroot] [PATCH 1/2] powerpc: update processor types
From: Peter Korsgaard @ 2012-12-09 22:41 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1355090043-12326-1-git-send-email-gustavo@zacarias.com.ar>
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:
Gustavo> Update the powerpc processor types.
Gustavo> Remove the 801, it's the original IBM experimental implementation.
Gustavo> Add the 464, 464fp, 476 and 476fp cores.
Committed both, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [pull request] Pull request for branch for-2013.02/armadeus/new-pkgs
From: Samuel Martin @ 2012-12-09 23:06 UTC (permalink / raw)
To: buildroot
Hello,
Here is the first round of package integration from Armadeus [1,2],
This just includes half a doxzen of new packages, nothing scary...
and more to come [3]... So, stay tuned! ;-)
Note that:
* openobex: still use the 1.5 release to not break ussp-push.
openobex can be updated to version 1.6 once integrated in BR, then
ussp-push fixed to linked against it.
* urg: bump to version 0.8.18 from the original patch (which integrate
the 0.8.11 release).
Yours,
Samuel
[1] www.armadeus.org
[2] git://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[3] http://www.armadeus.com/wiki/index.php?title=Buildroot_Mainline_integration
The following changes since commit 054f97e1f2de337ea0c788d766212a36d6d4e41c:
pkg-infra: add <pkg>-extract and <pkg>-patch targets to OVERRIDE support (2012-12-06 17:13:57 -0800)
are available in the git repository at:
git://github.com/tSed/buildroot.git for-2013.02/armadeus/new-pkgs
for you to fetch changes up to 810b52732660dfae986eb1cdc9cb6a878fd6bd2f:
libcanfestival: new package
Samuel Martin (6):
openobex: new package
ussp-push: new package
urg: new package
flite: new package
qwt: new package
libcanfestival: new package
package/Config.in | 5 +
package/libcanfestival/Config.in | 90 +++
.../libcanfestival-allow-to-set-DESTDIR.patch | 717 +++++++++++++++++++++
package/libcanfestival/libcanfestival.mk | 45 ++
package/multimedia/Config.in | 1 +
package/multimedia/flite/Config.in | 11 +
package/multimedia/flite/flite.mk | 57 ++
package/openobex/Config.in | 28 +
...penobex-libusb_check_when_cross-compiling.patch | 18 +
.../openobex-replace_deprecated_functions.patch | 30 +
package/openobex/openobex.mk | 35 +
package/qwt/Config.in | 17 +
.../qwt/qwt-5.2.1-change-install-directories.patch | 23 +
package/qwt/qwt-5.2.1-disable-designer.patch | 17 +
package/qwt/qwt.mk | 74 +++
package/urg/Config.in | 9 +
package/urg/urg.mk | 26 +
package/ussp-push/Config.in | 9 +
.../ussp-push-fix-build-against-bluez-4.patch | 15 +
package/ussp-push/ussp-push.mk | 13 +
20 files changed, 1240 insertions(+)
create mode 100644 package/libcanfestival/Config.in
create mode 100644 package/libcanfestival/libcanfestival-allow-to-set-DESTDIR.patch
create mode 100644 package/libcanfestival/libcanfestival.mk
create mode 100644 package/multimedia/flite/Config.in
create mode 100644 package/multimedia/flite/flite.mk
create mode 100644 package/openobex/Config.in
create mode 100644 package/openobex/openobex-libusb_check_when_cross-compiling.patch
create mode 100644 package/openobex/openobex-replace_deprecated_functions.patch
create mode 100644 package/openobex/openobex.mk
create mode 100644 package/qwt/Config.in
create mode 100644 package/qwt/qwt-5.2.1-change-install-directories.patch
create mode 100644 package/qwt/qwt-5.2.1-disable-designer.patch
create mode 100644 package/qwt/qwt.mk
create mode 100644 package/urg/Config.in
create mode 100644 package/urg/urg.mk
create mode 100644 package/ussp-push/Config.in
create mode 100644 package/ussp-push/ussp-push-fix-build-against-bluez-4.patch
create mode 100644 package/ussp-push/ussp-push.mk
--
1.8.0.1
^ permalink raw reply
* [Buildroot] [PATCH] openobex: new package
From: Samuel Martin @ 2012-12-09 23:06 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1355094387-22886-1-git-send-email-s.martin49@gmail.com>
Cc: Julien Boibessot <julien.boibessot@armadeus.com>
Cc: Eric Jarrige <eric.jarrige@armadeus.org>
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
package/Config.in | 1 +
package/openobex/Config.in | 28 +++++++++++++++++
...penobex-libusb_check_when_cross-compiling.patch | 18 +++++++++++
.../openobex-replace_deprecated_functions.patch | 30 +++++++++++++++++++
package/openobex/openobex.mk | 35 ++++++++++++++++++++++
5 files changed, 112 insertions(+)
create mode 100644 package/openobex/Config.in
create mode 100644 package/openobex/openobex-libusb_check_when_cross-compiling.patch
create mode 100644 package/openobex/openobex-replace_deprecated_functions.patch
create mode 100644 package/openobex/openobex.mk
diff --git a/package/Config.in b/package/Config.in
index 74e439e..0855684 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -632,6 +632,7 @@ source "package/ntp/Config.in"
source "package/nuttcp/Config.in"
source "package/olsr/Config.in"
source "package/openntpd/Config.in"
+source "package/openobex/Config.in"
source "package/openssh/Config.in"
source "package/openswan/Config.in"
source "package/openvpn/Config.in"
diff --git a/package/openobex/Config.in b/package/openobex/Config.in
new file mode 100644
index 0000000..06f4c7d
--- /dev/null
+++ b/package/openobex/Config.in
@@ -0,0 +1,28 @@
+config BR2_PACKAGE_OPENOBEX
+ bool "openobex"
+ help
+ Free open source implementation of the Object Exchange (OBEX)
+ protocol.
+
+ http://www.openobex.org
+
+if BR2_PACKAGE_OPENOBEX
+config BR2_PACKAGE_OPENOBEX_BLUEZ
+ bool "enable bluez support"
+ select BR2_PACKAGE_BLUEZ_UTILS
+
+config BR2_PACKAGE_OPENOBEX_LIBUSB
+ bool "enable libusb support"
+ select BR2_PACKAGE_LIBUSB
+
+config BR2_PACKAGE_OPENOBEX_APPS
+ bool "install test applications"
+ help
+ Also install the openobex test applications on target.
+
+config BR2_PACKAGE_OPENOBEX_SYSLOG
+ bool "enable debugging to the system logger"
+
+config BR2_PACKAGE_OPENOBEX_DUMP
+ bool "enable protocol dumping for debugging"
+endif
diff --git a/package/openobex/openobex-libusb_check_when_cross-compiling.patch b/package/openobex/openobex-libusb_check_when_cross-compiling.patch
new file mode 100644
index 0000000..7b8056a
--- /dev/null
+++ b/package/openobex/openobex-libusb_check_when_cross-compiling.patch
@@ -0,0 +1,18 @@
+Fix libusb check when cross-compiling.
+
+Signed-off-by: Julien Boibessot <julien.boibessot@armadeus.com>
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+
+Index: openobex-1.5/acinclude.m4
+===================================================================
+--- openobex-1.5.orig/acinclude.m4 2010-06-16 10:32:47.000000000 +0200
++++ openobex-1.5/acinclude.m4 2010-06-16 10:35:33.000000000 +0200
+@@ -158,7 +158,7 @@
+ ;;
+ *)
+ PKG_CHECK_MODULES(USB, libusb, usb_lib_found=yes, AC_MSG_RESULT(no))
+- AC_CHECK_FILE(${prefix}/lib/pkgconfig/libusb.pc, REQUIRES="libusb")
++ REQUIRES="libusb"
+ ;;
+ esac
+ AC_SUBST(USB_CFLAGS)
diff --git a/package/openobex/openobex-replace_deprecated_functions.patch b/package/openobex/openobex-replace_deprecated_functions.patch
new file mode 100644
index 0000000..17274d3
--- /dev/null
+++ b/package/openobex/openobex-replace_deprecated_functions.patch
@@ -0,0 +1,30 @@
+obex_test_cable.c: avoid to use SuSv3 LEGACY APIs
+
+Signed-off-by: Julien Boibessot <julien.boibessot@armadeus.com>
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+
+Index: openobex-1.5/apps/obex_test_cable.c
+===================================================================
+--- openobex-1.5.orig/apps/obex_test_cable.c 2009-02-08 19:30:22.000000000 +0100
++++ openobex-1.5/apps/obex_test_cable.c 2010-06-16 11:11:05.000000000 +0200
+@@ -113,9 +113,9 @@
+ if(total == sizeof(tmpbuf))
+ return -1;
+
+- if( (answer = index(tmpbuf, '\n')) ) {
++ if( (answer = strchr(tmpbuf, '\n')) ) {
+ // Remove first line (echo)
+- if( (answer_end = index(answer+1, '\n')) ) {
++ if( (answer_end = strchr(answer+1, '\n')) ) {
+ // Found end of answer
+ done = 1;
+ }
+@@ -178,7 +178,7 @@
+ }
+
+ tcgetattr(gt->ttyfd, >->oldtio);
+- bzero(>->newtio, sizeof(struct termios));
++ memset(>->newtio, 0, sizeof(struct termios));
+ gt->newtio.c_cflag = B115200 | CS8 | CREAD | CRTSCTS;
+ gt->newtio.c_iflag = IGNPAR;
+ gt->newtio.c_oflag = 0;
diff --git a/package/openobex/openobex.mk b/package/openobex/openobex.mk
new file mode 100644
index 0000000..beac5ff
--- /dev/null
+++ b/package/openobex/openobex.mk
@@ -0,0 +1,35 @@
+#############################################################
+#
+# openobex
+#
+#############################################################
+OPENOBEX_VERSION = 1.5
+OPENOBEX_SITE = http://ftp.osuosl.org/pub/linux/bluetooth
+# Libraries seems release under LGPLv2.1, while other material are undrer GPLv2
+OPENOBEX_LICENSE = GPLv2/LGPLv2.1
+OPENOBEX_LICENSE_FILES = COPYING COPYING.LIB
+
+OPENOBEX_AUTORECONF = YES
+OPENOBEX_INSTALL_STAGING = YES
+
+OPENOBEX_CONF_OPT += \
+ $(if $(BR2_ENABLE_DEBUG),--enable-debug) \
+ $(if $(BR2_PACKAGE_OPENOBEX_APPS),--enable-apps) \
+ $(if $(BR2_PACKAGE_OPENOBEX_SYSLOG),--enable-syslog) \
+ $(if $(BR2_PACKAGE_OPENOBEX_DUMP),--enable-dump)
+
+ifeq ($(BR2_PACKAGE_OPENOBEX_BLUEZ),y)
+OPENOBEX_DEPENDENCIES += bluez_utils
+OPENOBEX_CONF_OPT += --with-bluez=$(STAGING_DIR)
+else
+OPENOBEX_CONF_OPT += --disable-bluetooth
+endif
+
+ifeq ($(BR2_PACKAGE_OPENOBEX_LIBUSB),y)
+OPENOBEX_DEPENDENCIES += libusb
+OPENOBEX_CONF_OPT += --with-usb=$(STAGING_DIR)
+else
+OPENOBEX_CONF_OPT += --disable-usb
+endif
+
+$(eval $(autotools-package))
--
1.8.0.1
^ permalink raw reply related
* [Buildroot] [PATCH] ussp-push: new package
From: Samuel Martin @ 2012-12-09 23:06 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1355094387-22886-1-git-send-email-s.martin49@gmail.com>
Cc: Eric Jarrige <eric.jarrige@armadeus.org>
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
package/Config.in | 1 +
package/ussp-push/Config.in | 9 +++++++++
.../ussp-push/ussp-push-fix-build-against-bluez-4.patch | 15 +++++++++++++++
package/ussp-push/ussp-push.mk | 13 +++++++++++++
4 files changed, 38 insertions(+)
create mode 100644 package/ussp-push/Config.in
create mode 100644 package/ussp-push/ussp-push-fix-build-against-bluez-4.patch
create mode 100644 package/ussp-push/ussp-push.mk
diff --git a/package/Config.in b/package/Config.in
index 0855684..c530305 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -668,6 +668,7 @@ source "package/ttcp/Config.in"
source "package/udpcast/Config.in"
source "package/ulogd/Config.in"
source "package/ushare/Config.in"
+source "package/ussp-push/Config.in"
source "package/vpnc/Config.in"
source "package/vsftpd/Config.in"
source "package/vtun/Config.in"
diff --git a/package/ussp-push/Config.in b/package/ussp-push/Config.in
new file mode 100644
index 0000000..324280f
--- /dev/null
+++ b/package/ussp-push/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_USSP_PUSH
+ bool "ussp-push"
+ select BR2_PACKAGE_OPENOBEX
+ select BR2_PACKAGE_BLUEZ_UTILS
+ help
+ ussp-push is an OBEX object pusher for Linux, using the BlueZ
+ BlueTooth stack.
+
+ http://www.xmailserver.org/ussp-push.html
diff --git a/package/ussp-push/ussp-push-fix-build-against-bluez-4.patch b/package/ussp-push/ussp-push-fix-build-against-bluez-4.patch
new file mode 100644
index 0000000..0694bfb
--- /dev/null
+++ b/package/ussp-push/ussp-push-fix-build-against-bluez-4.patch
@@ -0,0 +1,15 @@
+Fix build against bluez4.
+
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+
+--- ussp-push-0.11.orig/src/obex_socket.c 2012-11-01 09:58:51.049538708 +0100
++++ ussp-push-0.11/src/obex_socket.c 2012-11-01 12:10:10.719506951 +0100
+@@ -197,7 +197,7 @@ static int bt_sock_name2bth(int devid, c
+ for (i = 0; i < niinf; i++) {
+ char devname[128];
+
+- if (hci_remote_name(dd, &piinf[i].bdaddr, sizeof(devname) - 1,
++ if (hci_read_remote_name(dd, &piinf[i].bdaddr, sizeof(devname) - 1,
+ devname, 100000) >= 0) {
+ if (strcasecmp(devname, btname) == 0) {
+ *btaddr = piinf[i].bdaddr;
diff --git a/package/ussp-push/ussp-push.mk b/package/ussp-push/ussp-push.mk
new file mode 100644
index 0000000..6f322ab
--- /dev/null
+++ b/package/ussp-push/ussp-push.mk
@@ -0,0 +1,13 @@
+#############################################################
+#
+# ussp-push
+#
+#############################################################
+USSP_PUSH_VERSION = 0.11
+USSP_PUSH_SITE = http://www.xmailserver.org
+USSP_PUSH_LICENSE = GPLv2
+USSP_PUSH_LICENSE_FILES = COPYING
+
+USSP_PUSH_DEPENDENCIES = bluez_utils openobex
+
+$(eval $(autotools-package))
--
1.8.0.1
^ permalink raw reply related
* [Buildroot] [PATCH] urg: new package
From: Samuel Martin @ 2012-12-09 23:06 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1355094387-22886-1-git-send-email-s.martin49@gmail.com>
Cc: Eric Jarrige <eric.jarrige@armadeus.org>
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
package/Config.in | 1 +
package/urg/Config.in | 9 +++++++++
package/urg/urg.mk | 26 ++++++++++++++++++++++++++
3 files changed, 36 insertions(+)
create mode 100644 package/urg/Config.in
create mode 100644 package/urg/urg.mk
diff --git a/package/Config.in b/package/Config.in
index c530305..45ccbcf 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -426,6 +426,7 @@ source "package/libv4l/Config.in"
source "package/mtdev/Config.in"
source "package/neardal/Config.in"
source "package/pcsc-lite/Config.in"
+source "package/urg/Config.in"
endmenu
menu "Javascript"
diff --git a/package/urg/Config.in b/package/urg/Config.in
new file mode 100644
index 0000000..9dd13bf
--- /dev/null
+++ b/package/urg/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_URG
+ bool "urg library"
+ select BR2_PACKAGE_SDL
+ select BR2_PACKAGE_SDL_NET
+ help
+ Library to control Hokuyo's URG series sensors.
+ Requires SDL & SDL_net.
+
+ http://www.hokuyo-aut.jp/02sensor/07scanner/download/urg_programs_en/
diff --git a/package/urg/urg.mk b/package/urg/urg.mk
new file mode 100644
index 0000000..d5b752a
--- /dev/null
+++ b/package/urg/urg.mk
@@ -0,0 +1,26 @@
+#############################################################
+#
+# urg library
+#
+#############################################################
+URG_VERSION = 0.8.18
+URG_SITE = http://www.hokuyo-aut.jp/02sensor/07scanner/download/urg_programs_en/
+URG_SOURCE = urg-$(URG_VERSION).zip
+URG_LICENSE = LGPLv3
+URG_LICENSE_FILES = COPYING
+
+URG_INSTALL_STAGING = YES
+
+URG_DEPENDENCIES = sdl sdl_net
+
+URG_CONF_OPT = --with-sdl-prefix=$(STAGING_DIR)/usr \
+ --with-sdl-exec-prefix=$(STAGING_DIR)/usr
+
+define URG_EXTRACT_CMDS
+ $(RM) -rf $(URG_DIR)
+ unzip -q -d $(BUILD_DIR)/ $(DL_DIR)/$(URG_SOURCE)
+ test -d $(URG_DIR) || \
+ mv $(BUILD_DIR)/$(subst .zip,,$(URG_SOURCE)) $(URG_DIR)
+endef
+
+$(eval $(autotools-package))
--
1.8.0.1
^ permalink raw reply related
* [Buildroot] [PATCH] flite: new package
From: Samuel Martin @ 2012-12-09 23:06 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1355094387-22886-1-git-send-email-s.martin49@gmail.com>
Cc: Eric Jarrige <eric.jarrige@armadeus.org>
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
package/multimedia/Config.in | 1 +
package/multimedia/flite/Config.in | 11 ++++++++
package/multimedia/flite/flite.mk | 57 ++++++++++++++++++++++++++++++++++++++
3 files changed, 69 insertions(+)
create mode 100644 package/multimedia/flite/Config.in
create mode 100644 package/multimedia/flite/flite.mk
diff --git a/package/multimedia/Config.in b/package/multimedia/Config.in
index 273d9bc..3ca0531 100644
--- a/package/multimedia/Config.in
+++ b/package/multimedia/Config.in
@@ -4,6 +4,7 @@ source "package/multimedia/aumix/Config.in"
source "package/multimedia/bellagio/Config.in"
source "package/multimedia/faad2/Config.in"
source "package/multimedia/flac/Config.in"
+source "package/multimedia/flite/Config.in"
source "package/multimedia/ffmpeg/Config.in"
source "package/multimedia/gstreamer/Config.in"
source "package/multimedia/gst-ffmpeg/Config.in"
diff --git a/package/multimedia/flite/Config.in b/package/multimedia/flite/Config.in
new file mode 100644
index 0000000..bef989c
--- /dev/null
+++ b/package/multimedia/flite/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_FLITE
+ bool "flite"
+ help
+ Flite: a small, fast run time synthesis engine.
+ Flite (festival-lite) is a small, fast run-time synthesis engine
+ developed at CMU and primarily designed for small embedded machines
+ and/or large servers. Flite is designed as an alternative synthesis
+ engine to Festival for voices built using the FestVox suite of voice
+ building tools.
+
+ http://www.speech.cs.cmu.edu/flite
diff --git a/package/multimedia/flite/flite.mk b/package/multimedia/flite/flite.mk
new file mode 100644
index 0000000..c72988f
--- /dev/null
+++ b/package/multimedia/flite/flite.mk
@@ -0,0 +1,57 @@
+#############################################################
+#
+# flite
+#
+#############################################################
+FLITE_VERSION = 1.4
+FLITE_SOURCE = flite-$(FLITE_VERSION)-release.tar.bz2
+FLITE_SITE = http://www.speech.cs.cmu.edu/flite/packed/flite-$(FLITE_VERSION)
+FLITE_LICENSE = BSD-4c
+FLITE_LICENSE_FILES = COPYING
+
+FLITE_INSTALL_STAGING = YES
+
+# Sadly, Flite does not support parallel build,
+# especially when build its shared libraries.
+FLITE_MAKE = $(MAKE1)
+
+FLITE_CONF_OPT = \
+ $(if $(BR2_PREFER_STATIC_LIB),,--enable-shared)
+
+FLITE_INSTALL_STAGING_OPT = \
+ INSTALLBINDIR=$(STAGING_DIR)/usr/bin \
+ INSTALLLIBDIR=$(STAGING_DIR)/usr/lib \
+ INSTALLINCDIR=$(STAGING_DIR)/usr/include/flite \
+ install
+
+FLITE_INSTALL_TARGET_OPT = \
+ INSTALLBINDIR=$(TARGET_DIR)/usr/bin \
+ INSTALLLIBDIR=$(TARGET_DIR)/usr/lib \
+ INSTALLINCDIR=$(TARGET_DIR)/usr/include/flite \
+ install
+
+# Flite totally screw up their tarball generation, so that:
+#
+# $ tar tf flite-1.4-release.tar.bz2
+# ...
+# flite-1.4-release//install-sh
+# flite-1.4-release//mkinstalldirs
+# flite-1.4-release//Exports.def
+# flite-1.4-release//flite.sln
+# flite-1.4-release//fliteDll.vcproj
+# flite-1.4-release/config/Makefile
+# flite-1.4-release/config/common_make_rules
+# flite-1.4-release/config/project.mak
+# flite-1.4-release/config/config.in
+# flite-1.4-release/config/system.mak.in
+#
+# So, the strip-component trick does not work at all.
+# Let's redefine the extract command.
+define FLITE_EXTRACT_CMDS
+ $(RM) -rf $(FLITE_DIR)
+ $(INFLATE$(suffix $(FLITE_SOURCE))) $(DL_DIR)/$(FLITE_SOURCE) | \
+ $(TAR) -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ mv $(BUILD_DIR)/$(subst .tar.bz2,,$(FLITE_SOURCE)) $(FLITE_DIR)
+endef
+
+$(eval $(autotools-package))
--
1.8.0.1
^ permalink raw reply related
* [Buildroot] [PATCH] qwt: new package
From: Samuel Martin @ 2012-12-09 23:06 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1355094387-22886-1-git-send-email-s.martin49@gmail.com>
Cc: Julien Boibessot <julien.boibessot@armadeus.com>
Cc: Eric Jarrige <eric.jarrige@armadeus.org>
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
package/Config.in | 1 +
package/qwt/Config.in | 17 +++++
.../qwt/qwt-5.2.1-change-install-directories.patch | 23 +++++++
package/qwt/qwt-5.2.1-disable-designer.patch | 17 +++++
package/qwt/qwt.mk | 74 ++++++++++++++++++++++
5 files changed, 132 insertions(+)
create mode 100644 package/qwt/Config.in
create mode 100644 package/qwt/qwt-5.2.1-change-install-directories.patch
create mode 100644 package/qwt/qwt-5.2.1-disable-designer.patch
create mode 100644 package/qwt/qwt.mk
diff --git a/package/Config.in b/package/Config.in
index 45ccbcf..88849d3 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -141,6 +141,7 @@ comment "QT libraries and helper libraries"
source "package/grantlee/Config.in"
source "package/qextserialport/Config.in"
source "package/qtuio/Config.in"
+source "package/qwt/Config.in"
endif
source "package/x11r7/Config.in"
diff --git a/package/qwt/Config.in b/package/qwt/Config.in
new file mode 100644
index 0000000..15e3925
--- /dev/null
+++ b/package/qwt/Config.in
@@ -0,0 +1,17 @@
+comment "Qwt requires Qt to be installed"
+ depends on !BR2_PACKAGE_QT
+
+config BR2_PACKAGE_QWT
+ bool "Qwt"
+ depends on BR2_PACKAGE_QT
+ help
+ Qwt for Embedded Linux.
+
+ http://qwt.sourceforge.net/
+
+config BR2_PACKAGE_QWT_EXAMPLES
+ bool "Examples"
+ depends on BR2_PACKAGE_QWT
+ select BR2_PACKAGE_QT_SVG
+ help
+ Compile & install the examples.
diff --git a/package/qwt/qwt-5.2.1-change-install-directories.patch b/package/qwt/qwt-5.2.1-change-install-directories.patch
new file mode 100644
index 0000000..4c28065
--- /dev/null
+++ b/package/qwt/qwt-5.2.1-change-install-directories.patch
@@ -0,0 +1,23 @@
+Change install directories.
+
+Signed-off-by: Julien Boibessot <julien.boibessot@armadeus.com>
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+
+--- qwt-5.2.1/src/src.pro.orig 2010-09-28 14:40:39.000000000 +0200
++++ qwt-5.2.1/src/src.pro 2010-09-28 14:41:29.000000000 +0200
+@@ -218,9 +218,12 @@
+ }
+
+ # Install directives
+-
+-headers.files = $$HEADERS
+-doc.files = $${QWT_ROOT}/doc/html $${QWT_ROOT}/doc/qwt-5.2.0.qch
++
++target.path = /usr/lib
++headers.files = $$HEADERS
++headers.path = /usr/include/qwt-5.2.1
++doc.files = $${QWT_ROOT}/doc/html $${QWT_ROOT}/doc/qwt-5.2.0.qch
++doc.path = /usr/doc/qwt-5.2.1
+ unix {
+ doc.files += $${QWT_ROOT}/doc/man
+ }
diff --git a/package/qwt/qwt-5.2.1-disable-designer.patch b/package/qwt/qwt-5.2.1-disable-designer.patch
new file mode 100644
index 0000000..5d1bbe5
--- /dev/null
+++ b/package/qwt/qwt-5.2.1-disable-designer.patch
@@ -0,0 +1,17 @@
+Disable QwtDesigner.
+
+Signed-off-by: Julien Boibessot <julien.boibessot@armadeus.com>
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+
+--- qwt-5.2.1/qwtconfig.pri.orig 2010-09-28 14:34:01.000000000 +0200
++++ qwt-5.2.1/qwtconfig.pri 2010-09-28 15:37:02.000000000 +0200
+@@ -115,7 +115,7 @@
+ # Otherwise you have to build it from the designer directory.
+ ######################################################################
+
+-CONFIG += QwtDesigner
++#CONFIG += QwtDesigner
+
+ ######################################################################
+ # If you want to auto build the examples, enable the line below
+
diff --git a/package/qwt/qwt.mk b/package/qwt/qwt.mk
new file mode 100644
index 0000000..3d4e7f1
--- /dev/null
+++ b/package/qwt/qwt.mk
@@ -0,0 +1,74 @@
+######################################################################
+#
+# QWT
+#
+######################################################################
+QWT_VERSION = 5.2.1
+QWT_SOURCE = qwt-$(QWT_VERSION).zip
+QWT_SITE = http://sourceforge.net/projects/qwt/files/qwt/$(QWT_VERSION)
+# Qwt License v1.0 is a LGPL v2.1 with exceptions
+QWT_LICENSE = QWTv1.0
+QWT_LICENSE_FILES = COPYING
+
+QWT_DEPENDENCIES = qt
+
+QWT_INSTALL_STAGING = YES
+
+define QWT_EXTRACT_CMDS
+ $(RM) -rf $(QWT_DIR)
+ unzip -q -d $(BUILD_DIR)/ $(DL_DIR)/$(QWT_SOURCE)
+ test -d $(QWT_DIR) || \
+ mv $(BUILD_DIR)/$(subst .zip,,$(QWT_SOURCE)) $(QWT_DIR)
+endef
+
+ifeq ($(BR2_PACKAGE_QWT_EXAMPLES),y)
+define QWT_CONFIGURE_EXAMPLES
+ test ! -f $(@D)/examples/Makefile || $(MAKE) -C $(@D)/examples distclean
+ cd $(@D)/examples && $(QT_QMAKE)
+endef
+
+define QWT_BUILD_EXAMPLES
+ $(MAKE) -C $(@D)/examples
+endef
+
+define QWT_INSTALL_STAGING_EXAMPLES
+ $(INSTALL) -d $(STAGING_DIR)/usr/local/qwt-5.2.1/examples/bin
+ cp -f $(@D)/examples/bin/* \
+ $(STAGING_DIR)/usr/local/qwt-5.2.1/examples/bin
+endef
+
+define QWT_INSTALL_TARGET_EXAMPLES
+ $(INSTALL) -d $(TARGET_DIR)/usr/local/qwt-5.2.1/examples/bin
+ cp -f $(STAGING_DIR)/usr/local/qwt-5.2.1/examples/bin/* \
+ $(TARGET_DIR)/usr/local/qwt-5.2.1/examples/bin
+endef
+endif
+
+
+define QWT_CONFIGURE_CMDS
+ test ! -f $(@D)/Makefile || $(MAKE) -C $(@D) distclean
+ cd $(@D) && $(QT_QMAKE)
+ $(QWT_CONFIGURE_EXAMPLES)
+endef
+
+define QWT_BUILD_CMDS
+ $(MAKE) -C $(@D)
+ $(QWT_BUILD_EXAMPLES)
+endef
+
+define QWT_INSTALL_STAGING_CMDS
+ $(MAKE) INSTALL_ROOT=$(STAGING_DIR) -C $(@D) install
+ $(QWT_INSTALL_STAGING_EXAMPLES)
+endef
+
+define QWT_INSTALL_TARGET_CMDS
+ cp -dpf $(STAGING_DIR)/usr/lib/libqwt.so* $(TARGET_DIR)/usr/lib/
+ $(QWT_INSTALL_TARGET_EXAMPLES)
+endef
+
+define QWT_CLEAN_CMDS
+ -$(MAKE) -C $(@D) clean
+ -rm $(TARGET_DIR)/usr/lib/libqwt.so.*
+endef
+
+$(eval $(generic-package))
--
1.8.0.1
^ permalink raw reply related
* [Buildroot] [PATCH] libcanfestival: new package
From: Samuel Martin @ 2012-12-09 23:06 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1355094387-22886-1-git-send-email-s.martin49@gmail.com>
Cc: Eric Jarrige <eric.jarrige@armadeus.org>
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
package/Config.in | 1 +
package/libcanfestival/Config.in | 90 +++
.../libcanfestival-allow-to-set-DESTDIR.patch | 717 +++++++++++++++++++++
package/libcanfestival/libcanfestival.mk | 45 ++
4 files changed, 853 insertions(+)
create mode 100644 package/libcanfestival/Config.in
create mode 100644 package/libcanfestival/libcanfestival-allow-to-set-DESTDIR.patch
create mode 100644 package/libcanfestival/libcanfestival.mk
diff --git a/package/Config.in b/package/Config.in
index 88849d3..ce78f79 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -455,6 +455,7 @@ endmenu
menu "Networking"
source "package/glib-networking/Config.in"
+source "package/libcanfestival/Config.in"
source "package/libcgi/Config.in"
source "package/libcgicc/Config.in"
source "package/libcurl/Config.in"
diff --git a/package/libcanfestival/Config.in b/package/libcanfestival/Config.in
new file mode 100644
index 0000000..0be45cf
--- /dev/null
+++ b/package/libcanfestival/Config.in
@@ -0,0 +1,90 @@
+config BR2_PACKAGE_LIBCANFESTIVAL
+ bool "CanFestival"
+ help
+ CanFestival is an OpenSource CANOpen framework, licensed with GPLv2
+ and LGPLv2.
+
+ http://www.canfestival.org
+
+if BR2_PACKAGE_LIBCANFESTIVAL
+
+config BR2_PACKAGE_LIBCANFESTIVAL_NBMMAXCAN
+ string "Number of can bus to use"
+ default "4"
+
+choice
+ prompt "Driver to use"
+ default BR2_PACKAGE_LIBCANFESTIVAL_SOCKET
+
+config BR2_PACKAGE_LIBCANFESTIVAL_ANAGATE_LINUX
+ bool "anagate_linux"
+ help
+ AnaGate CAN(duo) driver for linux
+
+config BR2_PACKAGE_LIBCANFESTIVAL_PEAK_LINUX
+ bool "peak_linux"
+ help
+ Linux build host installed Peak driver and library
+
+ http://www.peak-system.com/linux/
+
+config BR2_PACKAGE_LIBCANFESTIVAL_VIRTUAL
+ bool "virtual"
+ help
+ Unix pipe based virtual can driver
+
+config BR2_PACKAGE_LIBCANFESTIVAL_VIRTUAL_KERNEL
+ bool "virtual_kernel"
+ help
+ Kernel module virtual can driver
+
+config BR2_PACKAGE_LIBCANFESTIVAL_SOCKET
+ bool "socket"
+ help
+ Socket-can
+
+ http://developer.berlios.de/projects/socketcan/
+
+config BR2_PACKAGE_LIBCANFESTIVAL_LINCAN
+ bool "lincan"
+ help
+ Lincan driver
+
+ http://www.ocera.org/download/components/WP7/lincan-0.3.3.html
+
+config BR2_PACKAGE_LIBCANFESTIVAL_CAN4LINUX
+ bool "can4linux"
+ help
+ Can4linux driver
+
+ http://www.port.de/engl/canprod/hw_can4linux.html
+
+config BR2_PACKAGE_LIBCANFESTIVAL_COPCICAN_LINUX
+ bool "copcican_linux"
+ help
+ User space driver interface for CO-PCICAN card
+
+ http://www.cosateq.com/
+
+config BR2_PACKAGE_LIBCANFESTIVAL_COPCICAN_COMEDI
+ bool "copcican_comedi"
+ help
+ COMEDI driver interface for CO-PCICAN card
+
+ http://www.cosateq.com/
+
+endchoice
+
+config BR2_PACKAGE_LIBCANFESTIVAL_DRIVER
+ string
+ default "anagate_linux" if BR2_PACKAGE_LIBCANFESTIVAL_ANAGATE_LINUX
+ default "peak_linux" if BR2_PACKAGE_LIBCANFESTIVAL_PEAK_LINUX
+ default "virtual" if BR2_PACKAGE_LIBCANFESTIVAL_VIRTUAL
+ default "virtual_kernel" if BR2_PACKAGE_LIBCANFESTIVAL_VIRTUAL_KERNEL
+ default "socket" if BR2_PACKAGE_LIBCANFESTIVAL_SOCKET
+ default "lincan" if BR2_PACKAGE_LIBCANFESTIVAL_LINCAN
+ default "can4linux" if BR2_PACKAGE_LIBCANFESTIVAL_CAN4LINUX
+ default "copcican_linux" if BR2_PACKAGE_LIBCANFESTIVAL_COCPICAN_LINUX
+ default "copcican_comedi" if BR2_PACKAGE_LIBCANFESTIVAL_COPCICAN_COMEDI
+
+endif
diff --git a/package/libcanfestival/libcanfestival-allow-to-set-DESTDIR.patch b/package/libcanfestival/libcanfestival-allow-to-set-DESTDIR.patch
new file mode 100644
index 0000000..7e41022
--- /dev/null
+++ b/package/libcanfestival/libcanfestival-allow-to-set-DESTDIR.patch
@@ -0,0 +1,717 @@
+Fix install rules to allow DESTDIR usage.
+
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+
+diff -purN libcanfestival-71623bbf8093.orig/drivers/can_anagate_linux/Makefile libcanfestival-71623bbf8093/drivers/can_anagate_linux/Makefile
+--- libcanfestival-71623bbf8093.orig/drivers/can_anagate_linux/Makefile 2012-11-01 22:19:09.250087305 +0100
++++ libcanfestival-71623bbf8093/drivers/can_anagate_linux/Makefile 2012-11-01 22:19:36.936227361 +0100
+@@ -43,7 +43,7 @@ else
+ DRIVER = $(OBJS)
+ endif
+
+-TARGET_SOFILES = $(PREFIX)/lib/$(DRIVER)
++TARGET_SOFILES = $(DESTDIR)$(PREFIX)/lib/$(DRIVER)
+
+ all: driver
+
+@@ -56,8 +56,8 @@ libcanfestival_$(CAN_DRIVER).so: $(OBJS)
+ $(CC) -shared -Wl,-soname,libcanfestival_$(CAN_DRIVER).so $(CAN_DLL_CFLAGS) -o $@ $<
+
+ install: libcanfestival_$(CAN_DRIVER).so
+- mkdir -p $(PREFIX)/lib/
+- cp $< $(PREFIX)/lib/
++ mkdir -p $(DESTDIR)$(PREFIX)/lib/
++ cp $< $(DESTDIR)$(PREFIX)/lib/
+
+ uninstall:
+ rm -f $(TARGET_SOFILES)
+diff -purN libcanfestival-71623bbf8093.orig/drivers/can_anagate_linux/Makefile.in libcanfestival-71623bbf8093/drivers/can_anagate_linux/Makefile.in
+--- libcanfestival-71623bbf8093.orig/drivers/can_anagate_linux/Makefile.in 2012-11-01 22:19:09.250087305 +0100
++++ libcanfestival-71623bbf8093/drivers/can_anagate_linux/Makefile.in 2012-11-01 22:19:36.919561011 +0100
+@@ -43,7 +43,7 @@ else
+ DRIVER = $(OBJS)
+ endif
+
+-TARGET_SOFILES = $(PREFIX)/lib/$(DRIVER)
++TARGET_SOFILES = $(DESTDIR)$(PREFIX)/lib/$(DRIVER)
+
+ all: driver
+
+@@ -56,8 +56,8 @@ libcanfestival_$(CAN_DRIVER).so: $(OBJS)
+ $(CC) -shared -Wl,-soname,libcanfestival_$(CAN_DRIVER).so $(CAN_DLL_CFLAGS) -o $@ $<
+
+ install: libcanfestival_$(CAN_DRIVER).so
+- mkdir -p $(PREFIX)/lib/
+- cp $< $(PREFIX)/lib/
++ mkdir -p $(DESTDIR)$(PREFIX)/lib/
++ cp $< $(DESTDIR)$(PREFIX)/lib/
+
+ uninstall:
+ rm -f $(TARGET_SOFILES)
+diff -purN libcanfestival-71623bbf8093.orig/drivers/can_anagate_win32/Makefile.in libcanfestival-71623bbf8093/drivers/can_anagate_win32/Makefile.in
+--- libcanfestival-71623bbf8093.orig/drivers/can_anagate_win32/Makefile.in 2012-11-01 22:19:09.250087305 +0100
++++ libcanfestival-71623bbf8093/drivers/can_anagate_win32/Makefile.in 2012-11-01 22:19:36.902894661 +0100
+@@ -46,7 +46,7 @@ DRIVER = $(OBJS)
+ endif
+
+
+-TARGET_SOFILES = $(PREFIX)/lib/$(DRIVER)
++TARGET_SOFILES = $(DESTDIR)$(PREFIX)/lib/$(DRIVER)
+
+ all: driver
+
+@@ -69,8 +69,8 @@ $(DRIVER): $(OBJS)
+ -Wl,--exclude-libs,ALL -lws2_32
+
+ install: libcanfestival_$(CAN_DRIVER).so
+- mkdir -p $(PREFIX)/lib/
+- cp $< $(PREFIX)/lib/
++ mkdir -p $(DESTDIR)$(PREFIX)/lib/
++ cp $< $(DESTDIR)$(PREFIX)/lib/
+
+ uninstall:
+ rm -f $(TARGET_SOFILES)
+diff -purN libcanfestival-71623bbf8093.orig/drivers/can_can4linux/Makefile.in libcanfestival-71623bbf8093/drivers/can_can4linux/Makefile.in
+--- libcanfestival-71623bbf8093.orig/drivers/can_can4linux/Makefile.in 2012-11-01 22:19:09.256753845 +0100
++++ libcanfestival-71623bbf8093/drivers/can_can4linux/Makefile.in 2012-11-01 22:19:37.019559109 +0100
+@@ -42,7 +42,7 @@ else
+ DRIVER = $(OBJS)
+ endif
+
+-TARGET_SOFILES = $(PREFIX)/lib/$(DRIVER)
++TARGET_SOFILES = $(DESTDIR)$(PREFIX)/lib/$(DRIVER)
+
+ all: driver
+
+@@ -55,8 +55,8 @@ libcanfestival_$(CAN_DRIVER).so: $(OBJS)
+ $(CC) -shared -Wl,-soname,libcanfestival_$(CAN_DRIVER).so $(CAN_DLL_CFLAGS) -o $@ $<
+
+ install: libcanfestival_$(CAN_DRIVER).so
+- mkdir -p $(PREFIX)/lib/
+- cp $< $(PREFIX)/lib/
++ mkdir -p $(DESTDIR)$(PREFIX)/lib/
++ cp $< $(DESTDIR)$(PREFIX)/lib/
+
+ uninstall:
+ rm -f $(TARGET_HFILES)
+diff -purN libcanfestival-71623bbf8093.orig/drivers/can_copcican_linux/Makefile.in libcanfestival-71623bbf8093/drivers/can_copcican_linux/Makefile.in
+--- libcanfestival-71623bbf8093.orig/drivers/can_copcican_linux/Makefile.in 2012-11-01 22:19:09.246754035 +0100
++++ libcanfestival-71623bbf8093/drivers/can_copcican_linux/Makefile.in 2012-11-01 22:19:36.846229073 +0100
+@@ -45,7 +45,7 @@ else
+ DRIVER = $(OBJS)
+ endif
+
+-TARGET_SOFILES = $(PREFIX)/lib/$(DRIVER)
++TARGET_SOFILES = $(DESTDIR)$(PREFIX)/lib/$(DRIVER)
+
+ all: driver
+
+@@ -58,8 +58,8 @@ libcanfestival_$(CAN_DRIVER).so: $(OBJS)
+ $(CC) -shared -Wl,-soname,libcanfestival_$(CAN_DRIVER).so $(CAN_DLL_CFLAGS) -o $@ $<
+
+ install: libcanfestival_$(CAN_DRIVER).so
+- mkdir -p $(PREFIX)/lib/
+- cp $< $(PREFIX)/lib/
++ mkdir -p $(DESTDIR)$(PREFIX)/lib/
++ cp $< $(DESTDIR)$(PREFIX)/lib/
+
+ uninstall:
+ rm -f $(TARGET_SOFILES)
+diff -purN libcanfestival-71623bbf8093.orig/drivers/can_kvaser/Makefile.in libcanfestival-71623bbf8093/drivers/can_kvaser/Makefile.in
+--- libcanfestival-71623bbf8093.orig/drivers/can_kvaser/Makefile.in 2012-11-01 22:19:09.240087495 +0100
++++ libcanfestival-71623bbf8093/drivers/can_kvaser/Makefile.in 2012-11-01 22:19:36.766230593 +0100
+@@ -52,7 +52,7 @@ else
+ DRIVER = $(OBJS)
+ endif
+
+-TARGET_SOFILES = $(PREFIX)/lib/$(DRIVER)
++TARGET_SOFILES = $(DESTDIR)$(PREFIX)/lib/$(DRIVER)
+
+ all: driver
+
+@@ -65,8 +65,8 @@ $(DRIVER): $(OBJS)
+ $(CC) -shared -Wl,-soname,$(DRIVER) $(CAN_DLL_CFLAGS) -o $@ $<
+
+ install: $(DRIVER)
+- mkdir -p $(PREFIX)/lib/
+- cp $< $(PREFIX)/lib/
++ mkdir -p $(DESTDIR)$(PREFIX)/lib/
++ cp $< $(DESTDIR)$(PREFIX)/lib/
+
+ uninstall:
+ rm -f $(TARGET_SOFILES)
+diff -purN libcanfestival-71623bbf8093.orig/drivers/can_lincan/Makefile.in libcanfestival-71623bbf8093/drivers/can_lincan/Makefile.in
+--- libcanfestival-71623bbf8093.orig/drivers/can_lincan/Makefile.in 2012-11-01 22:19:09.260087115 +0100
++++ libcanfestival-71623bbf8093/drivers/can_lincan/Makefile.in 2012-11-01 22:19:37.056225077 +0100
+@@ -42,7 +42,7 @@ else
+ DRIVER = $(OBJS)
+ endif
+
+-TARGET_SOFILES = $(PREFIX)/lib/$(DRIVER)
++TARGET_SOFILES = $(DESTDIR)$(PREFIX)/lib/$(DRIVER)
+
+ all: driver
+
+@@ -55,8 +55,8 @@ libcanfestival_$(CAN_DRIVER).so: $(OBJS)
+ $(CC) -shared -Wl,-soname,libcanfestival_$(CAN_DRIVER).so $(CAN_DLL_CFLAGS) -o $@ $<
+
+ install: libcanfestival_$(CAN_DRIVER).so
+- mkdir -p $(PREFIX)/lib/
+- cp $< $(PREFIX)/lib/
++ mkdir -p $(DESTDIR)$(PREFIX)/lib/
++ cp $< $(DESTDIR)$(PREFIX)/lib/
+
+ uninstall:
+ rm -f $(TARGET_HFILES)
+diff -purN libcanfestival-71623bbf8093.orig/drivers/can_peak_linux/Makefile.in libcanfestival-71623bbf8093/drivers/can_peak_linux/Makefile.in
+--- libcanfestival-71623bbf8093.orig/drivers/can_peak_linux/Makefile.in 2012-11-01 22:19:09.256753845 +0100
++++ libcanfestival-71623bbf8093/drivers/can_peak_linux/Makefile.in 2012-11-01 22:19:37.046225267 +0100
+@@ -43,7 +43,7 @@ else
+ DRIVER = $(OBJS)
+ endif
+
+-TARGET_SOFILES = $(PREFIX)/lib/$(DRIVER)
++TARGET_SOFILES = $(DESTDIR)$(PREFIX)/lib/$(DRIVER)
+
+ all: driver
+
+@@ -56,8 +56,8 @@ libcanfestival_$(CAN_DRIVER).so: $(OBJS)
+ $(CC) -shared -Wl,-soname,libcanfestival_$(CAN_DRIVER).so $(CAN_DLL_CFLAGS) -o $@ $<
+
+ install: libcanfestival_$(CAN_DRIVER).so
+- mkdir -p $(PREFIX)/lib/
+- cp $< $(PREFIX)/lib/
++ mkdir -p $(DESTDIR)$(PREFIX)/lib/
++ cp $< $(DESTDIR)$(PREFIX)/lib/
+
+ uninstall:
+ rm -f $(TARGET_SOFILES)
+diff -purN libcanfestival-71623bbf8093.orig/drivers/can_peak_win32/Makefile.in libcanfestival-71623bbf8093/drivers/can_peak_win32/Makefile.in
+--- libcanfestival-71623bbf8093.orig/drivers/can_peak_win32/Makefile.in 2012-11-01 22:19:09.243420765 +0100
++++ libcanfestival-71623bbf8093/drivers/can_peak_win32/Makefile.in 2012-11-01 22:19:36.816229643 +0100
+@@ -45,7 +45,7 @@ else
+ DRIVER = $(OBJS)
+ endif
+
+-TARGET_SOFILES = $(PREFIX)/lib/$(DRIVER)
++TARGET_SOFILES = $(DESTDIR)$(PREFIX)/lib/$(DRIVER)
+
+ all: driver
+
+@@ -63,8 +63,8 @@ cyg$(CAN_DRIVER).dll: $(OBJS)
+ -Wl,--exclude-libs,ALL
+
+ install: libcanfestival_$(CAN_DRIVER).so
+- mkdir -p $(PREFIX)/lib/
+- cp $< $(PREFIX)/lib/
++ mkdir -p $(DESTDIR)$(PREFIX)/lib/
++ cp $< $(DESTDIR)$(PREFIX)/lib/
+
+ uninstall:
+ rm -f $(TARGET_SOFILES)
+diff -purN libcanfestival-71623bbf8093.orig/drivers/can_serial/Makefile.in libcanfestival-71623bbf8093/drivers/can_serial/Makefile.in
+--- libcanfestival-71623bbf8093.orig/drivers/can_serial/Makefile.in 2012-11-01 22:19:09.246754035 +0100
++++ libcanfestival-71623bbf8093/drivers/can_serial/Makefile.in 2012-11-01 22:19:36.879561771 +0100
+@@ -46,8 +46,8 @@ endif
+
+ HUB=can_serial_hub
+
+-TARGET_SOFILES = $(PREFIX)/lib/$(DRIVER)
+-TARGET_BINFILES = $(PREFIX)/bin/$(HUB)
++TARGET_SOFILES = $(DESTDIR)$(PREFIX)/lib/$(DRIVER)
++TARGET_BINFILES = $(DESTDIR)$(PREFIX)/bin/$(HUB)
+
+ all: driver $(HUB)
+
+@@ -63,10 +63,10 @@ libcanfestival_$(CAN_DRIVER).so: $(OBJS)
+ $(CC) -shared -Wl,-soname,libcanfestival_$(CAN_DRIVER).so $(CAN_DLL_CFLAGS) -o $@ $<
+
+ install: libcanfestival_$(CAN_DRIVER).so $(HUB)
+- mkdir -p $(PREFIX)/lib/
+- cp libcanfestival_$(CAN_DRIVER).so $(PREFIX)/lib/
+- mkdir -p $(PREFIX)/bin/
+- cp $(HUB) $(PREFIX)/bin/
++ mkdir -p $(DESTDIR)$(PREFIX)/lib/
++ cp libcanfestival_$(CAN_DRIVER).so $(DESTDIR)$(PREFIX)/lib/
++ mkdir -p $(DESTDIR)$(PREFIX)/bin/
++ cp $(HUB) $(DESTDIR)$(PREFIX)/bin/
+
+ uninstall:
+ rm -f $(TARGET_SOFILES)
+diff -purN libcanfestival-71623bbf8093.orig/drivers/can_socket/Makefile.in libcanfestival-71623bbf8093/drivers/can_socket/Makefile.in
+--- libcanfestival-71623bbf8093.orig/drivers/can_socket/Makefile.in 2012-11-01 22:19:09.283420005 +0100
++++ libcanfestival-71623bbf8093/drivers/can_socket/Makefile.in 2012-11-01 22:19:37.079557967 +0100
+@@ -43,7 +43,7 @@ else
+ DRIVER = $(OBJS)
+ endif
+
+-TARGET_SOFILES = $(PREFIX)/lib/$(DRIVER)
++TARGET_SOFILES = $(DESTDIR)$(PREFIX)/lib/$(DRIVER)
+
+ all: driver
+
+@@ -56,8 +56,8 @@ libcanfestival_$(CAN_DRIVER).so: $(OBJS)
+ $(CC) -shared -Wl,-soname,libcanfestival_$(CAN_DRIVER).so $(CAN_DLL_CFLAGS) -o $@ $<
+
+ install: libcanfestival_$(CAN_DRIVER).so
+- mkdir -p $(PREFIX)/lib/
+- cp $< $(PREFIX)/lib/
++ mkdir -p $(DESTDIR)$(PREFIX)/lib/
++ cp $< $(DESTDIR)$(PREFIX)/lib/
+
+ uninstall:
+ rm -f $(TARGET_SOFILES)
+diff -purN libcanfestival-71623bbf8093.orig/drivers/can_tcp_win32/Makefile.in libcanfestival-71623bbf8093/drivers/can_tcp_win32/Makefile.in
+--- libcanfestival-71623bbf8093.orig/drivers/can_tcp_win32/Makefile.in 2012-11-01 22:19:09.256753845 +0100
++++ libcanfestival-71623bbf8093/drivers/can_tcp_win32/Makefile.in 2012-11-01 22:19:37.029558919 +0100
+@@ -47,7 +47,7 @@ endif
+
+ SERVER = $(CAN_DRIVER)_server
+
+-TARGET_SOFILES = $(PREFIX)/lib/$(DRIVER)
++TARGET_SOFILES = $(DESTDIR)$(PREFIX)/lib/$(DRIVER)
+
+ all: driver
+
+@@ -74,8 +74,8 @@ $(DRIVER): $(OBJS)
+ -Wl,--exclude-libs,ALL -lws2_32
+
+ install: libcanfestival_$(CAN_DRIVER).so
+- mkdir -p $(PREFIX)/lib/
+- cp $< $(PREFIX)/lib/
++ mkdir -p $(DESTDIR)$(PREFIX)/lib/
++ cp $< $(DESTDIR)$(PREFIX)/lib/
+
+ uninstall:
+ rm -f $(TARGET_SOFILES)
+diff -purN libcanfestival-71623bbf8093.orig/drivers/can_virtual/Makefile.in libcanfestival-71623bbf8093/drivers/can_virtual/Makefile.in
+--- libcanfestival-71623bbf8093.orig/drivers/can_virtual/Makefile.in 2012-11-01 22:19:09.246754035 +0100
++++ libcanfestival-71623bbf8093/drivers/can_virtual/Makefile.in 2012-11-01 22:19:36.859562151 +0100
+@@ -43,7 +43,7 @@ else
+ DRIVER = $(OBJS)
+ endif
+
+-TARGET_SOFILES = $(PREFIX)/lib/$(DRIVER)
++TARGET_SOFILES = $(DESTDIR)$(PREFIX)/lib/$(DRIVER)
+
+ all: driver
+
+@@ -56,8 +56,8 @@ libcanfestival_$(CAN_DRIVER).so: $(OBJS)
+ $(CC) -shared -Wl,-soname,libcanfestival_$(CAN_DRIVER).so $(CAN_DLL_CFLAGS) -o $@ $<
+
+ install: libcanfestival_$(CAN_DRIVER).so
+- mkdir -p $(PREFIX)/lib/
+- cp $< $(PREFIX)/lib/
++ mkdir -p $(DESTDIR)$(PREFIX)/lib/
++ cp $< $(DESTDIR)$(PREFIX)/lib/
+
+ uninstall:
+ rm -f $(TARGET_SOFILES)
+diff -purN libcanfestival-71623bbf8093.orig/drivers/can_vscom/Makefile.in libcanfestival-71623bbf8093/drivers/can_vscom/Makefile.in
+--- libcanfestival-71623bbf8093.orig/drivers/can_vscom/Makefile.in 2012-11-01 22:19:09.283420005 +0100
++++ libcanfestival-71623bbf8093/drivers/can_vscom/Makefile.in 2012-11-01 22:19:37.072891427 +0100
+@@ -61,7 +61,7 @@ else
+ DRIVER = $(OBJS)
+ endif
+
+-TARGET_SOFILES = $(PREFIX)/lib/$(DRIVER)
++TARGET_SOFILES = $(DESTDIR)$(PREFIX)/lib/$(DRIVER)
+
+ all: driver
+
+@@ -83,8 +83,8 @@ libcanfestival_$(CAN_DRIVER).$(DLL_TYPE)
+ $(CC) $(PROG_CFLAGS) -shared $(CAN_VSCOM_DLL_FLAGS) -o $@ $< $(CAN_DLL_CFLAGS)
+
+ install: libcanfestival_$(CAN_DRIVER).so
+- mkdir -p $(PREFIX)/lib/
+- cp $< $(PREFIX)/lib/
++ mkdir -p $(DESTDIR)$(PREFIX)/lib/
++ cp $< $(DESTDIR)$(PREFIX)/lib/
+
+ uninstall:
+ rm -f $(TARGET_SOFILES)
+diff -purN libcanfestival-71623bbf8093.orig/drivers/timers_rtai/Makefile.in libcanfestival-71623bbf8093/drivers/timers_rtai/Makefile.in
+--- libcanfestival-71623bbf8093.orig/drivers/timers_rtai/Makefile.in 2012-11-01 22:19:09.246754035 +0100
++++ libcanfestival-71623bbf8093/drivers/timers_rtai/Makefile.in 2012-11-01 22:19:36.886228311 +0100
+@@ -38,7 +38,7 @@ OBJS = $(TIMERS_DRIVER).o
+
+ SRC_HFILES = ../../include/$(TIMERS_DRIVER)/timerscfg.h
+
+-TARGET_HFILES = $(PREFIX)/include/canfestival/timerscfg.h
++TARGET_HFILES = $(DESTDIR)$(PREFIX)/include/canfestival/timerscfg.h
+
+ all: driver
+
+@@ -48,8 +48,8 @@ driver: $(OBJS)
+ $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $<
+
+ install:
+- mkdir -p $(PREFIX)/include/canfestival
+- cp $(SRC_HFILES) $(PREFIX)/include/canfestival
++ mkdir -p $(DESTDIR)$(PREFIX)/include/canfestival
++ cp $(SRC_HFILES) $(DESTDIR)$(PREFIX)/include/canfestival
+
+ uninstall:
+ rm -f $(TARGET_HFILES)
+diff -purN libcanfestival-71623bbf8093.orig/drivers/timers_unix/Makefile.in libcanfestival-71623bbf8093/drivers/timers_unix/Makefile.in
+--- libcanfestival-71623bbf8093.orig/drivers/timers_unix/Makefile.in 2012-11-01 22:19:09.243420765 +0100
++++ libcanfestival-71623bbf8093/drivers/timers_unix/Makefile.in 2012-11-01 22:19:36.796230023 +0100
+@@ -38,7 +38,7 @@ OBJS = $(TIMERS_DRIVER).o
+
+ SRC_HFILES = ../../include/$(TIMERS_DRIVER)/timerscfg.h
+
+-TARGET_HFILES = $(PREFIX)/include/canfestival/timerscfg.h
++TARGET_HFILES = $(DESTDIR)$(PREFIX)/include/canfestival/timerscfg.h
+
+ all: driver
+
+@@ -48,8 +48,8 @@ driver: $(OBJS)
+ $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $<
+
+ install:
+- mkdir -p $(PREFIX)/include/canfestival
+- cp $(SRC_HFILES) $(PREFIX)/include/canfestival
++ mkdir -p $(DESTDIR)$(PREFIX)/include/canfestival
++ cp $(SRC_HFILES) $(DESTDIR)$(PREFIX)/include/canfestival
+
+ uninstall:
+ rm -f $(TARGET_HFILES)
+diff -purN libcanfestival-71623bbf8093.orig/drivers/timers_win32/Makefile.in libcanfestival-71623bbf8093/drivers/timers_win32/Makefile.in
+--- libcanfestival-71623bbf8093.orig/drivers/timers_win32/Makefile.in 2012-11-01 22:19:09.246754035 +0100
++++ libcanfestival-71623bbf8093/drivers/timers_win32/Makefile.in 2012-11-01 22:19:36.866228691 +0100
+@@ -40,7 +40,7 @@ OBJS = $(TIMERS_DRIVER).o
+
+ SRC_HFILES = ../../include/$(TIMERS_DRIVER)/timerscfg.h
+
+-TARGET_HFILES = $(PREFIX)/include/canfestival/timerscfg.h
++TARGET_HFILES = $(DESTDIR)$(PREFIX)/include/canfestival/timerscfg.h
+
+ all: driver
+
+@@ -50,8 +50,8 @@ driver: $(OBJS)
+ $(CXX) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $<
+
+ install:
+- mkdir -p $(PREFIX)/include/canfestival
+- cp $(SRC_HFILES) $(PREFIX)/include/canfestival
++ mkdir -p $(DESTDIR)$(PREFIX)/include/canfestival
++ cp $(SRC_HFILES) $(DESTDIR)$(PREFIX)/include/canfestival
+
+ uninstall:
+ rm -f $(TARGET_HFILES)
+diff -purN libcanfestival-71623bbf8093.orig/drivers/timers_xeno/Makefile.in libcanfestival-71623bbf8093/drivers/timers_xeno/Makefile.in
+--- libcanfestival-71623bbf8093.orig/drivers/timers_xeno/Makefile.in 2012-11-01 22:19:09.260087115 +0100
++++ libcanfestival-71623bbf8093/drivers/timers_xeno/Makefile.in 2012-11-01 22:19:37.066224887 +0100
+@@ -38,7 +38,7 @@ OBJS = $(TIMERS_DRIVER).o
+
+ SRC_HFILES = ../../include/$(TIMERS_DRIVER)/timerscfg.h
+
+-TARGET_HFILES = $(PREFIX)/include/canfestival/timerscfg.h
++TARGET_HFILES = $(DESTDIR)$(PREFIX)/include/canfestival/timerscfg.h
+
+ all: driver
+
+@@ -48,8 +48,8 @@ driver: $(OBJS)
+ $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $<
+
+ install:
+- mkdir -p $(PREFIX)/include/canfestival
+- cp $(SRC_HFILES) $(PREFIX)/include/canfestival
++ mkdir -p $(DESTDIR)$(PREFIX)/include/canfestival
++ cp $(SRC_HFILES) $(DESTDIR)$(PREFIX)/include/canfestival
+
+ uninstall:
+ rm -f $(TARGET_HFILES)
+diff -purN libcanfestival-71623bbf8093.orig/drivers/unix/Makefile.in libcanfestival-71623bbf8093/drivers/unix/Makefile.in
+--- libcanfestival-71623bbf8093.orig/drivers/unix/Makefile.in 2012-11-01 22:19:09.250087305 +0100
++++ libcanfestival-71623bbf8093/drivers/unix/Makefile.in 2012-11-01 22:19:36.896228121 +0100
+@@ -51,7 +51,7 @@ endif
+
+ SRC_HFILES = ../../include/$(TARGET)/applicfg.h ../../include/$(TARGET)/canfestival.h
+
+-TARGET_HFILES = $(PREFIX)/include/$(TARGET)/applicfg.h $(PREFIX)/include/$(TARGET)/canfestival.h
++TARGET_HFILES = $(DESTDIR)$(PREFIX)/include/$(TARGET)/applicfg.h $(DESTDIR)$(PREFIX)/include/$(TARGET)/canfestival.h
+
+ all: driver
+
+@@ -104,13 +104,13 @@ libcanfestival_$(TARGET).a: $(OBJS)
+ $(BINUTILS_PREFIX)ranlib $@
+
+ install: libcanfestival_$(TARGET).a
+- mkdir -p $(PREFIX)/lib/
+- mkdir -p $(PREFIX)/include/canfestival
+- cp libcanfestival_$(TARGET).a $(PREFIX)/lib/
+- cp $(SRC_HFILES) $(PREFIX)/include/canfestival
++ mkdir -p $(DESTDIR)$(PREFIX)/lib/
++ mkdir -p $(DESTDIR)$(PREFIX)/include/canfestival
++ cp libcanfestival_$(TARGET).a $(DESTDIR)$(PREFIX)/lib/
++ cp $(SRC_HFILES) $(DESTDIR)$(PREFIX)/include/canfestival
+
+ uninstall:
+- rm -f $(PREFIX)/lib/libcanfestival_$(TARGET).a
++ rm -f $(DESTDIR)$(PREFIX)/lib/libcanfestival_$(TARGET).a
+ rm -f $(TARGET_HFILES)
+
+ clean:
+diff -purN libcanfestival-71623bbf8093.orig/drivers/win32/Makefile.in libcanfestival-71623bbf8093/drivers/win32/Makefile.in
+--- libcanfestival-71623bbf8093.orig/drivers/win32/Makefile.in 2012-11-01 22:19:09.253420575 +0100
++++ libcanfestival-71623bbf8093/drivers/win32/Makefile.in 2012-11-01 22:19:36.976226599 +0100
+@@ -47,7 +47,7 @@ endif
+
+ SRC_HFILES = ../../include/$(TARGET)/applicfg.h ../../include/$(TARGET)/canfestival.h
+
+-TARGET_HFILES = $(PREFIX)/include/$(TARGET)/applicfg.h $(PREFIX)/include/$(TARGET)/canfestival.h
++TARGET_HFILES = $(DESTDIR)$(PREFIX)/include/$(TARGET)/applicfg.h $(DESTDIR)$(PREFIX)/include/$(TARGET)/canfestival.h
+
+ all: driver
+
+@@ -71,13 +71,13 @@ libcanfestival_$(TARGET).a: $(OBJS)
+ $(BINUTILS_PREFIX)ranlib $@
+
+ install: libcanfestival_$(TARGET).a
+- mkdir -p $(PREFIX)/lib/
+- mkdir -p $(PREFIX)/include/canfestival
+- cp libcanfestival_$(TARGET).a $(PREFIX)/lib/
+- cp $(SRC_HFILES) $(PREFIX)/include/canfestival
++ mkdir -p $(DESTDIR)$(PREFIX)/lib/
++ mkdir -p $(DESTDIR)$(PREFIX)/include/canfestival
++ cp libcanfestival_$(TARGET).a $(DESTDIR)$(PREFIX)/lib/
++ cp $(SRC_HFILES) $(DESTDIR)$(PREFIX)/include/canfestival
+
+ uninstall:
+- rm -f $(PREFIX)/lib/libcanfestival_$(TARGET).a
++ rm -f $(DESTDIR)$(PREFIX)/lib/libcanfestival_$(TARGET).a
+ rm -f $(TARGET_HFILES)
+
+ clean:
+diff -purN libcanfestival-71623bbf8093.orig/examples/CANOpenShell/Makefile.in libcanfestival-71623bbf8093/examples/CANOpenShell/Makefile.in
+--- libcanfestival-71623bbf8093.orig/examples/CANOpenShell/Makefile.in 2012-11-01 22:19:09.313419433 +0100
++++ libcanfestival-71623bbf8093/examples/CANOpenShell/Makefile.in 2012-11-01 22:19:37.802877543 +0100
+@@ -88,8 +88,8 @@ mrproper: clean
+ rm -f CANOpenShellSlaveOD.c
+
+ install: $(CANOPENSHELL)
+- mkdir -p $(PREFIX)/bin/
+- cp $< $(PREFIX)/bin/
++ mkdir -p $(DESTDIR)$(PREFIX)/bin/
++ cp $< $(DESTDIR)$(PREFIX)/bin/
+
+ uninstall:
+- rm -f $(PREFIX)/bin/$(CANOPENSHELL)
+\ No newline at end of file
++ rm -f $(DESTDIR)$(PREFIX)/bin/$(CANOPENSHELL)
+\ No newline@end of file
+diff -purN libcanfestival-71623bbf8093.orig/examples/DS401_Master/Makefile.in libcanfestival-71623bbf8093/examples/DS401_Master/Makefile.in
+--- libcanfestival-71623bbf8093.orig/examples/DS401_Master/Makefile.in 2012-11-01 22:19:09.303419623 +0100
++++ libcanfestival-71623bbf8093/examples/DS401_Master/Makefile.in 2012-11-01 22:19:37.642880585 +0100
+@@ -67,10 +67,10 @@ mrproper: clean
+ rm -f TestMaster.c
+
+ install: DS401_Master
+- mkdir -p $(PREFIX)/bin/
+- cp $< $(PREFIX)/bin/
++ mkdir -p $(DESTDIR)$(PREFIX)/bin/
++ cp $< $(DESTDIR)$(PREFIX)/bin/
+
+ uninstall:
+- rm -f $(PREFIX)/bin/DS401_Master
++ rm -f $(DESTDIR)$(PREFIX)/bin/DS401_Master
+
+
+diff -purN libcanfestival-71623bbf8093.orig/examples/DS401_Slave_Gui/Makefile.in libcanfestival-71623bbf8093/examples/DS401_Slave_Gui/Makefile.in
+--- libcanfestival-71623bbf8093.orig/examples/DS401_Slave_Gui/Makefile.in 2012-11-01 22:19:09.316752703 +0100
++++ libcanfestival-71623bbf8093/examples/DS401_Slave_Gui/Makefile.in 2012-11-01 22:19:37.889542561 +0100
+@@ -76,11 +76,11 @@ mrproper: clean
+ $(RM) $(EXEC) $(DEPEND_FILE)
+
+ install: DS401_Slave_Gui
+- mkdir -p $(PREFIX)/bin/
+- cp $< $(PREFIX)/bin/
++ mkdir -p $(DESTDIR)$(PREFIX)/bin/
++ cp $< $(DESTDIR)$(PREFIX)/bin/
+
+ uninstall:
+- rm -f $(PREFIX)/bin/DS401_Slave_Gui
++ rm -f $(DESTDIR)$(PREFIX)/bin/DS401_Slave_Gui
+
+ $(EXEC): $(OBJS)
+ $(LD) $(OBJS) `wx-config --libs` -o $(EXEC)
+diff -purN libcanfestival-71623bbf8093.orig/examples/kerneltest/Makefile.in libcanfestival-71623bbf8093/examples/kerneltest/Makefile.in
+--- libcanfestival-71623bbf8093.orig/examples/kerneltest/Makefile.in 2012-11-01 22:19:09.320085973 +0100
++++ libcanfestival-71623bbf8093/examples/kerneltest/Makefile.in 2012-11-01 22:19:38.102871835 +0100
+@@ -68,12 +68,12 @@ mrproper: clean
+
+ install:
+ $(MAKE) -C $(KERNELDIR) M=$(shell pwd) modules_install
+- mkdir -p $(PREFIX)/bin/
+- cp console/canf_ktest_console $(PREFIX)/bin/
++ mkdir -p $(DESTDIR)$(PREFIX)/bin/
++ cp console/canf_ktest_console $(DESTDIR)$(PREFIX)/bin/
+ /bin/sh insert.sh
+
+ uninstall:
+- rm -f $(PREFIX)/bin/canf_ktest_console
++ rm -f $(DESTDIR)$(PREFIX)/bin/canf_ktest_console
+
+ canf_ktest_console: console/console.c console/console.h
+ $(CC) console/console.c -o console/canf_ktest_console
+diff -purN libcanfestival-71623bbf8093.orig/examples/SillySlave/Makefile.in libcanfestival-71623bbf8093/examples/SillySlave/Makefile.in
+--- libcanfestival-71623bbf8093.orig/examples/SillySlave/Makefile.in 2012-11-01 22:19:09.293419814 +0100
++++ libcanfestival-71623bbf8093/examples/SillySlave/Makefile.in 2012-11-01 22:19:37.372885721 +0100
+@@ -67,10 +67,10 @@ mrproper: clean
+ rm -f SillySlave.c
+
+ install: SillySlave
+- mkdir -p $(PREFIX)/bin/
+- cp $< $(PREFIX)/bin/
++ mkdir -p $(DESTDIR)$(PREFIX)/bin/
++ cp $< $(DESTDIR)$(PREFIX)/bin/
+
+ uninstall:
+- rm -f $(PREFIX)/bin/SillySlave
++ rm -f $(DESTDIR)$(PREFIX)/bin/SillySlave
+
+
+diff -purN libcanfestival-71623bbf8093.orig/examples/test_copcican_linux/Makefile.in libcanfestival-71623bbf8093/examples/test_copcican_linux/Makefile.in
+--- libcanfestival-71623bbf8093.orig/examples/test_copcican_linux/Makefile.in 2012-11-01 22:19:09.310086163 +0100
++++ libcanfestival-71623bbf8093/examples/test_copcican_linux/Makefile.in 2012-11-01 22:19:37.779544653 +0100
+@@ -67,10 +67,10 @@ mrproper: clean
+ rm -f test_copcican_linux.c
+
+ install: test_copcican_linux
+- mkdir -p $(PREFIX)/bin/
+- cp $< $(PREFIX)/bin/
++ mkdir -p $(DESTDIR)$(PREFIX)/bin/
++ cp $< $(DESTDIR)$(PREFIX)/bin/
+
+ uninstall:
+- rm -f $(PREFIX)/bin/test_copcican_linux
++ rm -f $(DESTDIR)$(PREFIX)/bin/test_copcican_linux
+
+
+diff -purN libcanfestival-71623bbf8093.orig/examples/TestMasterMicroMod/Makefile.in libcanfestival-71623bbf8093/examples/TestMasterMicroMod/Makefile.in
+--- libcanfestival-71623bbf8093.orig/examples/TestMasterMicroMod/Makefile.in 2012-11-01 22:19:09.306752893 +0100
++++ libcanfestival-71623bbf8093/examples/TestMasterMicroMod/Makefile.in 2012-11-01 22:19:37.699546175 +0100
+@@ -75,10 +75,10 @@ mrproper: clean
+ rm -f TestMaster.c
+
+ install: TestMasterMicroMod
+- mkdir -p $(PREFIX)/bin/
+- cp $< $(PREFIX)/bin/
++ mkdir -p $(DESTDIR)$(PREFIX)/bin/
++ cp $< $(DESTDIR)$(PREFIX)/bin/
+
+ uninstall:
+- rm -f $(PREFIX)/bin/TestMasterMicroMod
++ rm -f $(DESTDIR)$(PREFIX)/bin/TestMasterMicroMod
+
+
+diff -purN libcanfestival-71623bbf8093.orig/examples/TestMasterSlave/Makefile.in libcanfestival-71623bbf8093/examples/TestMasterSlave/Makefile.in
+--- libcanfestival-71623bbf8093.orig/examples/TestMasterSlave/Makefile.in 2012-11-01 22:19:09.300086353 +0100
++++ libcanfestival-71623bbf8093/examples/TestMasterSlave/Makefile.in 2012-11-01 22:19:37.496216709 +0100
+@@ -88,11 +88,11 @@ mrproper: clean
+ rm -f TestMaster.c
+
+ install: TestMasterSlave
+- mkdir -p $(PREFIX)/bin/
+- cp $< $(PREFIX)/bin/
++ mkdir -p $(DESTDIR)$(PREFIX)/bin/
++ cp $< $(DESTDIR)$(PREFIX)/bin/
+
+ uninstall:
+- rm -f $(PREFIX)/bin/TestMasterSlave
++ rm -f $(DESTDIR)$(PREFIX)/bin/TestMasterSlave
+
+
+
+diff -purN libcanfestival-71623bbf8093.orig/examples/TestMasterSlaveLSS/Makefile.in libcanfestival-71623bbf8093/examples/TestMasterSlaveLSS/Makefile.in
+--- libcanfestival-71623bbf8093.orig/examples/TestMasterSlaveLSS/Makefile.in 2012-11-01 22:19:09.290086545 +0100
++++ libcanfestival-71623bbf8093/examples/TestMasterSlaveLSS/Makefile.in 2012-11-01 22:19:37.236221653 +0100
+@@ -88,11 +88,11 @@ mrproper: clean
+ rm -f TestMaster.c
+
+ install: TestMasterSlaveLSS
+- mkdir -p $(PREFIX)/bin/
+- cp $< $(PREFIX)/bin/
++ mkdir -p $(DESTDIR)$(PREFIX)/bin/
++ cp $< $(DESTDIR)$(PREFIX)/bin/
+
+ uninstall:
+- rm -f $(PREFIX)/bin/TestMasterSlaveLSS
++ rm -f $(DESTDIR)$(PREFIX)/bin/TestMasterSlaveLSS
+
+
+
+diff -purN libcanfestival-71623bbf8093.orig/objdictgen/Makefile.in libcanfestival-71623bbf8093/objdictgen/Makefile.in
+--- libcanfestival-71623bbf8093.orig/objdictgen/Makefile.in 2012-11-01 22:19:09.326752513 +0100
++++ libcanfestival-71623bbf8093/objdictgen/Makefile.in 2012-11-01 22:19:38.269535333 +0100
+@@ -35,19 +35,19 @@ gnosis/version.py:
+ rm -rf gnosis_extract
+
+ install: gnosis
+- mkdir -p $(PREFIX)/objdictgen
+- cp -r *.py* config doc doc_index locale examples gnosis *.ico $(PREFIX)/objdictgen
+- chmod -R a+r $(PREFIX)/objdictgen
+- mkdir -p $(PREFIX)/bin
+- ln -sf $(PREFIX)/objdictgen/objdictedit.py $(PREFIX)/bin/objdictedit
+- chmod 755 $(PREFIX)/objdictgen/objdictedit.py
+- ln -sf $(PREFIX)/objdictgen/objdictgen.py $(PREFIX)/bin/objdictgen
+- chmod 755 $(PREFIX)/objdictgen/objdictgen.py
++ mkdir -p $(DESTDIR)$(PREFIX)/objdictgen
++ cp -r *.py* config doc doc_index locale examples gnosis *.ico $(DESTDIR)$(PREFIX)/objdictgen
++ chmod -R a+r $(DESTDIR)$(PREFIX)/objdictgen
++ mkdir -p $(DESTDIR)$(PREFIX)/bin
++ ln -sf $(DESTDIR)$(PREFIX)/objdictgen/objdictedit.py $(DESTDIR)$(PREFIX)/bin/objdictedit
++ chmod 755 $(DESTDIR)$(PREFIX)/objdictgen/objdictedit.py
++ ln -sf $(DESTDIR)$(PREFIX)/objdictgen/objdictgen.py $(DESTDIR)$(PREFIX)/bin/objdictgen
++ chmod 755 $(DESTDIR)$(PREFIX)/objdictgen/objdictgen.py
+
+ uninstall:
+- rm -rf $(PREFIX)/objdictgen
+- rm -f $(PREFIX)/bin/objdictedit
+- rm -f $(PREFIX)/bin/objdictgen
++ rm -rf $(DESTDIR)$(PREFIX)/objdictgen
++ rm -f $(DESTDIR)$(PREFIX)/bin/objdictedit
++ rm -f $(DESTDIR)$(PREFIX)/bin/objdictgen
+
+ clean:
+
+diff -purN libcanfestival-71623bbf8093.orig/src/Makefile.in libcanfestival-71623bbf8093/src/Makefile.in
+--- libcanfestival-71623bbf8093.orig/src/Makefile.in 2012-11-01 22:19:09.286753275 +0100
++++ libcanfestival-71623bbf8093/src/Makefile.in 2012-11-01 22:19:37.129557017 +0100
+@@ -94,11 +94,11 @@ clean:
+
+ install:
+ $(MAKE) -C $(KERNELDIR) M=$(shell pwd) modules_install
+- mkdir -p $(PREFIX)/include/canfestival
+- cp ../include/*.h $(PREFIX)/include/canfestival
++ mkdir -p $(DESTDIR)$(PREFIX)/include/canfestival
++ cp ../include/*.h $(DESTDIR)$(PREFIX)/include/canfestival
+
+ uninstall:
+- rm -rf $(PREFIX)/include/canfestival
++ rm -rf $(DESTDIR)$(PREFIX)/include/canfestival
+
+ else
+ CFLAGS = SUB_OPT_CFLAGS
+@@ -132,14 +132,14 @@ $(TARGET)_%.o: %.c
+ $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $<
+
+ install: libcanfestival.a
+- mkdir -p $(PREFIX)/lib/
+- mkdir -p $(PREFIX)/include/canfestival
+- cp libcanfestival.a $(PREFIX)/lib/
+- cp ../include/*.h $(PREFIX)/include/canfestival
++ mkdir -p $(DESTDIR)$(PREFIX)/lib/
++ mkdir -p $(DESTDIR)$(PREFIX)/include/canfestival
++ cp libcanfestival.a $(DESTDIR)$(PREFIX)/lib/
++ cp ../include/*.h $(DESTDIR)$(PREFIX)/include/canfestival
+
+ uninstall:
+- rm -f $(PREFIX)/lib/libcanfestival.a
+- rm -rf $(PREFIX)/include/canfestival
++ rm -f $(DESTDIR)$(PREFIX)/lib/libcanfestival.a
++ rm -rf $(DESTDIR)$(PREFIX)/include/canfestival
+
+ clean:
+ rm -f $(OBJS) libcanfestival.a libcanfestival.o
diff --git a/package/libcanfestival/libcanfestival.mk b/package/libcanfestival/libcanfestival.mk
new file mode 100644
index 0000000..0a2b956
--- /dev/null
+++ b/package/libcanfestival/libcanfestival.mk
@@ -0,0 +1,45 @@
+#############################################################
+#
+# libcanfestival
+#
+#############################################################
+# Revision 760:
+LIBCANFESTIVAL_VERSION = 71623bbf8093
+LIBCANFESTIVAL_SITE_METHOD = hg
+LIBCANFESTIVAL_SITE = http://dev.automforge.net/CanFestival-3
+# Runtime code is licensed LGPLv2, whereas accompanying developer tools are
+# licensed GPLv2.
+LIBCANFESTIVAL_LICENSE = LGPL2.1/GPLv2
+LIBCANFESTIVAL_LICENSE_FILES = COPYING LICENCE
+
+LIBCANFESTIVAL_INSTALL_STAGING = YES
+
+define LIBCANFESTIVAL_CONFIGURE_CMDS
+ cd $(@D) && \
+ ./configure --binutils=$(TARGET_CROSS) --cc="$(TARGET_CC)" \
+ --cxx="$(TARGET_CC)" --ld="$(TARGET_CC)" \
+ --can=$(BR2_PACKAGE_LIBCANFESTIVAL_DRIVER) \
+ --MAX_CAN_BUS_ID=$(BR2_PACKAGE_LIBCANFESTIVAL_NBMMAXCAN)
+endef
+
+define LIBCANFESTIVAL_BUILD_CMDS
+ $(MAKE) -C $(@D) all
+endef
+
+define LIBCANFESTIVAL_INSTALL_TARGET_CMDS
+ $(MAKE) -C $(@D)/src install DESTDIR=$(TARGET_DIR)
+ $(MAKE) -C $(@D)/drivers install DESTDIR=$(TARGET_DIR)
+ $(MAKE) -C $(@D)/examples install DESTDIR=$(TARGET_DIR)
+endef
+
+define LIBCANFESTIVAL_INSTALL_STAGING_CMDS
+ $(MAKE) -C $(@D)/src install DESTDIR=$(STAGING_DIR)
+ $(MAKE) -C $(@D)/drivers install DESTDIR=$(STAGING_DIR)
+ $(MAKE) -C $(@D)/examples install DESTDIR=$(STAGING_DIR)
+endef
+
+define LIBCANFESTIVAL_CLEAN_CMDS
+ $(MAKE) -C $(@D) mrproper
+endef
+
+$(eval $(generic-package))
--
1.8.0.1
^ permalink raw reply related
* [Buildroot] usb_modeswitch and lsusb yield Segmentation fault
From: Sagaert Johan @ 2012-12-09 23:06 UTC (permalink / raw)
To: buildroot
Hi
I am using the latest git pull of buildroot.
Both usb_modeswitch and lsusb fail on execute.
# lsusb
Segmentation fault
# usb_modeswitch
Segmentation fault
Can sombody verify this on a real target ?
(i am using a karo tx53 module running kernel 3.4.21)
I suspect it has something to do with libusb.
Looking at the makefile of usb_modeswitch, it seems to link against libusb.so
It looks this is pointing to libusb-compat-0.1.4
In the source code of usb_modeswitch there is a line (1896) saying : ....based on libusb0 (0.1.12 and above ...)
So something seems to be wrong (libusb-compat-0.1.4 is the latest version) , should usb_modeswitch be linked to libusb-1.0.9
instead. ?
I will try to link against to the other usblib, as soon as my current build finishes ...
I suspect the lsusb problem is similar
Johan
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20121210/189e63c6/attachment.html>
^ permalink raw reply
* [Buildroot] libusb confusion
From: Sagaert Johan @ 2012-12-09 23:43 UTC (permalink / raw)
To: buildroot
Hi
There seem to be more libusb's ....
http://sourceforge.net/projects/libusb/files/
Claims the latest version is 0.1.4 (buildroot libusb-compat)
#############################################################
#
# libusb-compat
#
#############################################################
LIBUSB_COMPAT_VERSION = 0.1.4
LIBUSB_COMPAT_SOURCE = libusb-compat-$(LIBUSB_COMPAT_VERSION).tar.bz2
LIBUSB_COMPAT_SITE = http://downloads.sourceforge.net/project/libusb/libusb-compat-0.1/libusb-compat-$(LIBUSB_COMPAT_VERSION)
And then we also have in buildroot libusb 1.0.9
#############################################################
#
# libusb
#
#############################################################
LIBUSB_VERSION = 1.0.9
LIBUSB_SOURCE = libusb-$(LIBUSB_VERSION).tar.bz2
LIBUSB_SITE = http://downloads.sourceforge.net/project/libusb/libusb-1.0/libusb-$(LIBUSB_VERSION)
But there is also : http://libusb.sourceforge.net/download.html
http://prdownloads.sourceforge.net/libusb/libusb-0.1.12.tar.gz
I think usb_modeswitch needs this one.
Sagaert Johan
^ permalink raw reply
* [Buildroot] [PATCH 1/1] libusb-compat : bump version
From: Sagaert Johan @ 2012-12-10 0:19 UTC (permalink / raw)
To: buildroot
There seemed to be another more recent version around
of the libusb-compat package.
The new version fixes the Segmentation fault of the usb_modeswitch package.
Signed-off-by: Sagaert Johan <sagaert.johan@skynet.be>
---
package/libusb-compat/libusb-compat-0.1.3-pkgconfig.patch | 10 ----------
package/libusb-compat/libusb-compat.mk | 7 +++++--
2 files changed, 5 insertions(+), 12 deletions(-)
delete mode 100644 package/libusb-compat/libusb-compat-0.1.3-pkgconfig.patch
diff --git a/package/libusb-compat/libusb-compat-0.1.3-pkgconfig.patch b/package/libusb-compat/libusb-compat-0.1.3-pkgconfig.patch
deleted file mode 100644
index e5ba786..0000000
--- a/package/libusb-compat/libusb-compat-0.1.3-pkgconfig.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- libusb-compat-0.1.3.orig/libusb.pc.in 2008-06-18 00:13:02.000000000 +0100
-+++ libusb-compat-0.1.3/libusb.pc.in 2009-09-16 12:06:50.000000000 +0100
-@@ -9,6 +9,7 @@ emulated_by=libusb-1.0
- Name: libusb
- Description: USB access library (libusb-1.0 compat wrapper)
- Version: @LIBUSB01_VERSION@
-+Requires: libusb-1.0
- Libs: -L${libdir} -lusb
- Cflags: -I${includedir}
-
diff --git a/package/libusb-compat/libusb-compat.mk b/package/libusb-compat/libusb-compat.mk
index 848c705..b9177ee 100644
--- a/package/libusb-compat/libusb-compat.mk
+++ b/package/libusb-compat/libusb-compat.mk
@@ -3,12 +3,15 @@
# libusb-compat
#
#############################################################
-LIBUSB_COMPAT_VERSION = 0.1.4
+LIBUSB_COMPAT_VERSION = 0.1.12
LIBUSB_COMPAT_SOURCE = libusb-compat-$(LIBUSB_COMPAT_VERSION).tar.bz2
-LIBUSB_COMPAT_SITE = http://downloads.sourceforge.net/project/libusb/libusb-compat-0.1/libusb-compat-$(LIBUSB_COMPAT_VERSION)
+LIBUSB_COMPAT_SOURCE = libusb-$(LIBUSB_COMPAT_VERSION).tar.gz
+LIBUSB_COMPAT_SITE = http://prdownloads.sourceforge.net/libusb
LIBUSB_COMPAT_DEPENDENCIES = host-pkgconf libusb
LIBUSB_COMPAT_INSTALL_STAGING = YES
+LIBUSB_COMPAT_CONF_OPT +=--disable-build-docs
+
define LIBUSB_COMPAT_FIXUP_CONFIG
$(SED) 's%prefix=/usr%prefix=$(STAGING_DIR)/usr%' \
-e 's%exec_prefix=/usr%exec_prefix=$(STAGING_DIR)/usr%' \
--
1.8.0.1
^ permalink raw reply related
* [Buildroot] [PATCH 1/1] usb_modeswitch does not need libusb
From: Sagaert Johan @ 2012-12-10 0:25 UTC (permalink / raw)
To: buildroot
Only libusb-compat is needed to build usb_modeswitch
Signed-off-by: Sagaert Johan <sagaert.johan@skynet.be>
---
package/usb_modeswitch/Config.in | 1 -
1 file changed, 1 deletion(-)
diff --git a/package/usb_modeswitch/Config.in b/package/usb_modeswitch/Config.in
index a27b3ee..19371bb 100644
--- a/package/usb_modeswitch/Config.in
+++ b/package/usb_modeswitch/Config.in
@@ -1,7 +1,6 @@
config BR2_PACKAGE_USB_MODESWITCH
bool "usb_modeswitch"
depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
- select BR2_PACKAGE_LIBUSB
select BR2_PACKAGE_LIBUSB_COMPAT
help
USB mode switcher.
--
1.8.0.1
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox