From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Message-ID: <5255ACD3.9030104@pengutronix.de> Date: Wed, 09 Oct 2013 21:21:55 +0200 From: Marc Kleine-Budde MIME-Version: 1.0 References: <52505A18.8010003@pengutronix.de> <525135BA.7000408@pengutronix.de> <525539D5.3060400@pengutronix.de> In-Reply-To: Subject: Re: [ptxdist] Problem adding new package. Reply-To: ptxdist@pengutronix.de List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============0019616336==" Sender: ptxdist-bounces@pengutronix.de Errors-To: ptxdist-bounces@pengutronix.de To: ptxdist@pengutronix.de Cc: Javier Fileiv This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --===============0019616336== Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="W2uJDO6gnJ8acCVxRf5DhJ0h8HOvhVXcf" This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --W2uJDO6gnJ8acCVxRf5DhJ0h8HOvhVXcf Content-Type: multipart/mixed; boundary="------------000900040807000801060901" This is a multi-part message in MIME format. --------------000900040807000801060901 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Hello Javier, please keep the mailinglist on Cc. On 10/09/2013 08:50 PM, Javier Fileiv wrote: > Now, I set everything as you said but is not linking... I used as the > build package for the ptxdist newpackage as "src-make-prog"...is that o= k? As this package is sort of autotoolized better use: ptxdist newpackage target However I've done that for you, apply this patch to your BSP. At least speech_tools produce some static libs. If you want anything else, it's up to you. > p.s.> I didnt do top-post now, right? ;) Nope, still top-posting. cheers, MArc --=20 Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917-5555 | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | --------------000900040807000801060901 Content-Type: text/x-diff; name="0001-speech_tools-add-new-package.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0001-speech_tools-add-new-package.patch" =46rom 7efba85f615befc8afe53859070c9b8ff59df5d0 Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Wed, 9 Oct 2013 21:19:16 +0200 Subject: [PATCH] speech_tools: add new package Signed-off-by: Marc Kleine-Budde --- ...s-HACK-build-system-to-make-CC-and-CXX-ov.patch | 24 ++++ ...02-fix-compilation-with-modern-toolchains.patch | 133 +++++++++++++++= ++++++ patches/speech_tools-2.1/series | 5 + rules/speech_tools.in | 7 ++ rules/speech_tools.make | 58 +++++++++ 5 files changed, 227 insertions(+) create mode 100644 patches/speech_tools-2.1/0001-gcc_defaults-HACK-build= -system-to-make-CC-and-CXX-ov.patch create mode 100644 patches/speech_tools-2.1/0002-fix-compilation-with-mo= dern-toolchains.patch create mode 100644 patches/speech_tools-2.1/series create mode 100644 rules/speech_tools.in create mode 100644 rules/speech_tools.make diff --git a/patches/speech_tools-2.1/0001-gcc_defaults-HACK-build-system= -to-make-CC-and-CXX-ov.patch b/patches/speech_tools-2.1/0001-gcc_defaults= -HACK-build-system-to-make-CC-and-CXX-ov.patch new file mode 100644 index 0000000..4796247 --- /dev/null +++ b/patches/speech_tools-2.1/0001-gcc_defaults-HACK-build-system-to-mak= e-CC-and-CXX-ov.patch @@ -0,0 +1,24 @@ +From: Marc Kleine-Budde +Date: Wed, 9 Oct 2013 09:30:38 +0200 +Subject: [PATCH] gcc_defaults: HACK build system to make CC and CXX + overwriteable + +--- + config/compilers/gcc_defaults.mak | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/config/compilers/gcc_defaults.mak b/config/compilers/gcc_de= faults.mak +index a885266..9a5291e 100644 +--- a/config/compilers/gcc_defaults.mak ++++ b/config/compilers/gcc_defaults.mak +@@ -38,8 +38,8 @@ + ## = ## + ######################################################################= ##### +=20 +-CC=3Dgcc +-CXX=3Dgcc ++CC=3D$(CC) ++CXX=3D$(CXX) + ifeq ($(OSTYPE),Darwin) + CXX=3Dg++ + endif diff --git a/patches/speech_tools-2.1/0002-fix-compilation-with-modern-to= olchains.patch b/patches/speech_tools-2.1/0002-fix-compilation-with-moder= n-toolchains.patch new file mode 100644 index 0000000..9a9b106 --- /dev/null +++ b/patches/speech_tools-2.1/0002-fix-compilation-with-modern-toolchain= s.patch @@ -0,0 +1,133 @@ +From: Peter Drysdale +Date: Wed, 9 Oct 2013 21:16:55 +0200 +Subject: [PATCH] fix compilation with modern toolchains + +This patch allows compiling of festival on gcc 4.7 and clang 3.0. +Both these compilers are stricter of unqualified method calls in +templates than previous versions of gcc. +This patch should not alter the code in a substantive way as it +only qualifies method calls which were assumed in previous compilers. +No copyright subsists in this patch as it is too trivial. +--- + base_class/EST_TSimpleMatrix.cc | 9 +++++---- + base_class/EST_TSimpleVector.cc | 7 ++++--- + include/EST_TIterator.h | 4 ++-- + include/EST_TNamedEnum.h | 2 +- + 4 files changed, 12 insertions(+), 10 deletions(-) + +diff --git a/base_class/EST_TSimpleMatrix.cc b/base_class/EST_TSimpleMat= rix.cc +index ca6bdf7..09b989f 100644 +--- a/base_class/EST_TSimpleMatrix.cc ++++ b/base_class/EST_TSimpleMatrix.cc +@@ -44,6 +44,7 @@ + #include "EST_TVector.h" + #include + #include ++#include + #include "EST_cutils.h" +=20 + template=20 +@@ -51,7 +52,7 @@ void EST_TSimpleMatrix::copy_data(const EST_TSimple= Matrix &a) + { + =20 + if (!a.p_sub_matrix && !this->p_sub_matrix) +- memcpy((void *)&this->a_no_check(0,0), ++ std::memcpy((void *)&this->a_no_check(0,0), + (const void *)&a.a_no_check(0,0), + this->num_rows()*this->num_columns()*sizeof(T) + ); +@@ -98,7 +99,7 @@ void EST_TSimpleMatrix::resize(int new_rows, + { + int copy_r =3D Lof(this->num_rows(), new_rows); +=20 +- just_resize(new_rows, new_cols, &old_vals); ++ this->just_resize(new_rows, new_cols, &old_vals); +=20 + for (q=3D0; q<(copy_r*new_cols*sizeof(T)); q++) /* memcpy */ + ((char *)this->p_memory)[q] =3D ((char *)old_vals)[q]; +@@ -127,9 +128,9 @@ void EST_TSimpleMatrix::resize(int new_rows, + int copy_r =3D Lof(this->num_rows(), new_rows); + int copy_c =3D Lof(this->num_columns(), new_cols); + =20 +- just_resize(new_rows, new_cols, &old_vals); ++ this->just_resize(new_rows, new_cols, &old_vals); +=20 +- set_values(old_vals, ++ this->set_values(old_vals, + old_row_step, old_column_step, + 0, copy_r, + 0, copy_c); +diff --git a/base_class/EST_TSimpleVector.cc b/base_class/EST_TSimpleVec= tor.cc +index c6a0acf..ea9bcc6 100644 +--- a/base_class/EST_TSimpleVector.cc ++++ b/base_class/EST_TSimpleVector.cc +@@ -43,6 +43,7 @@ + #include "EST_TSimpleVector.h" + #include "EST_matrix_support.h" + #include ++#include + #include "EST_cutils.h" +=20 + template void EST_TSimpleVector::copy(const EST_TSimpleVect= or &a) +@@ -50,7 +51,7 @@ template void EST_TSimpleVector::copy(cons= t EST_TSimpleVector &a) + if (this->p_column_step=3D=3D1 && a.p_column_step=3D=3D1) + { + resize(a.n(), FALSE); +- memcpy((void *)(this->p_memory), (const void *)(a.p_memory), this->= n() * sizeof(T)); ++ std::memcpy((void *)(this->p_memory), (const void *)(a.p_memory), t= his->n() * sizeof(T)); + } + else + ((EST_TVector *)this)->copy(a); +@@ -70,7 +71,7 @@ template void EST_TSimpleVector::resize(in= t newn, int set) + int old_offset =3D this->p_offset; + unsigned int q; +=20 +- just_resize(newn, &old_vals); ++ this->just_resize(newn, &old_vals); +=20 + if (set && old_vals) + { +@@ -140,7 +141,7 @@ template EST_TSimpleVector &EST_TSimpleV= ector::operator=3D(const ES + template void EST_TSimpleVector::zero() + { + if (this->p_column_step=3D=3D1) +- memset((void *)(this->p_memory), 0, this->n() * sizeof(T)); ++ std::memset((void *)(this->p_memory), 0, this->n() * sizeof(T)); + else + ((EST_TVector *)this)->fill(*this->def_val); + } +diff --git a/include/EST_TIterator.h b/include/EST_TIterator.h +index e2c6e0b..3ae2201 100644 +--- a/include/EST_TIterator.h ++++ b/include/EST_TIterator.h +@@ -209,7 +209,7 @@ public: +=20 + /// Create an iterator ready to run over the given container. + EST_TStructIterator(const Container &over) +- { begin(over); } ++ { this->begin(over); } +=20 + const Entry *operator ->() const + {return &this->current();} +@@ -289,7 +289,7 @@ public: +=20 + /// Create an iterator ready to run over the given container. + EST_TRwStructIterator(Container &over) +- { begin(over); } ++ { this->begin(over); } +=20 + Entry *operator ->() const + {return &this->current();} +diff --git a/include/EST_TNamedEnum.h b/include/EST_TNamedEnum.h +index 8f54d73..f1e5aa1 100644 +--- a/include/EST_TNamedEnum.h ++++ b/include/EST_TNamedEnum.h +@@ -130,7 +130,7 @@ public: + {this->initialise((const void *)defs); }; + EST_TNamedEnumI(EST_TValuedEnumDefinition defs[], ENUM (*conv)(const char *)) + {this->initialise((const void *)defs, conv); }; +- const char *name(ENUM tok, int n=3D0) const {return value(tok,n); }; ++ const char *name(ENUM tok, int n=3D0) const {return this->value(tok,n= ); }; +=20 + }; +=20 diff --git a/patches/speech_tools-2.1/series b/patches/speech_tools-2.1/s= eries new file mode 100644 index 0000000..ca37de6 --- /dev/null +++ b/patches/speech_tools-2.1/series @@ -0,0 +1,5 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-gcc_defaults-HACK-build-system-to-make-CC-and-CXX-ov.patch +0002-fix-compilation-with-modern-toolchains.patch +# 4bb08202a42b3001d652f86363a19d81 - git-ptx-patches magic diff --git a/rules/speech_tools.in b/rules/speech_tools.in new file mode 100644 index 0000000..25050c0 --- /dev/null +++ b/rules/speech_tools.in @@ -0,0 +1,7 @@ +## SECTION=3Dproject_specific + +config SPEECH_TOOLS + tristate + prompt "speech_tools" + help + FIXME diff --git a/rules/speech_tools.make b/rules/speech_tools.make new file mode 100644 index 0000000..88a723e --- /dev/null +++ b/rules/speech_tools.make @@ -0,0 +1,58 @@ +# -*-makefile-*- +# +# Copyright (C) 2013 by Marc Kleine-Budde +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditio= ns +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_SPEECH_TOOLS) +=3D speech_tools + +# +# Paths and names +# +SPEECH_TOOLS_VERSION :=3D 2.1 +SPEECH_TOOLS_MD5 :=3D 6920ddc75b042910a3bcfee3ab106938 +SPEECH_TOOLS :=3D speech_tools-$(SPEECH_TOOLS_VERSION) +SPEECH_TOOLS_SUFFIX :=3D tar.gz +SPEECH_TOOLS_URL :=3D http://www.cstr.ed.ac.uk/downloads/festival/$(SPEE= CH_TOOLS_VERSION)/$(SPEECH_TOOLS)-release.$(SPEECH_TOOLS_SUFFIX) +SPEECH_TOOLS_SOURCE :=3D $(SRCDIR)/$(SPEECH_TOOLS).$(SPEECH_TOOLS_SUFFIX= ) +SPEECH_TOOLS_DIR :=3D $(BUILDDIR)/$(SPEECH_TOOLS) +SPEECH_TOOLS_LICENSE :=3D unknown + +# ----------------------------------------------------------------------= ------ +# Prepare +# ----------------------------------------------------------------------= ------ + +# +# autoconf +# +SPEECH_TOOLS_CONF_TOOL :=3D autoconf +SPEECH_TOOLS_MAKE_OPT :=3D $(CROSS_ENV_CC) $(CROSS_ENV_CXX) +SPEECH_TOOLS_MAKE_PAR :=3D NO + +# ----------------------------------------------------------------------= ------ +# Target-Install +# ----------------------------------------------------------------------= ------ + +$(STATEDIR)/speech_tools.targetinstall: + @$(call targetinfo) + + @$(call install_init, speech_tools) + @$(call install_fixup, speech_tools,PRIORITY,optional) + @$(call install_fixup, speech_tools,SECTION,base) + @$(call install_fixup, speech_tools,AUTHOR,"Marc Kleine-Budde ") + @$(call install_fixup, speech_tools,DESCRIPTION,missing) + +# @$(call install_copy, speech_tools, 0, 0, 0755, $(SPEECH_TOOLS_DIR)/fo= obar, /dev/null) + + @$(call install_finish, speech_tools) + + @$(call touch) + +# vim: syntax=3Dmake --=20 1.8.4.rc3 --------------000900040807000801060901-- --W2uJDO6gnJ8acCVxRf5DhJ0h8HOvhVXcf Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.14 (GNU/Linux) Comment: Using GnuPG with Icedove - http://www.enigmail.net/ iEYEARECAAYFAlJVrNMACgkQjTAFq1RaXHN3YgCeM6aKEDZ7Brf8edfzKBJxWSAa sGAAoIznLE8s68lEYr4unz6K2qmGavjE =ZVuS -----END PGP SIGNATURE----- --W2uJDO6gnJ8acCVxRf5DhJ0h8HOvhVXcf-- --===============0019616336== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline -- ptxdist mailing list ptxdist@pengutronix.de --===============0019616336==--