Patchwork Remove LIBTOOL

login
register
mail settings
Submitter Yann Diorcet
Date Oct. 21, 2012, 8:14 p.m.
Message ID <1350850487-7367-1-git-send-email-diorcet.yann@gmail.com>
Download mbox | patch
Permalink /patch/193056/
State Accepted
Headers show

Comments

Yann Diorcet - Oct. 21, 2012, 8:14 p.m.
From: Yann Diorcet <yann.diorcet@belledonne-communications.com>

Use sharedlibdir for library
Remove EXTRA_OEMAKE: 
1) works without it
2) cause issue with mingw32 target OS
---
 recipes/freetype/freetype.inc |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
Esben Haabendal - Dec. 14, 2012, 7:14 p.m.
Yann Diorcet <diorcet.yann@gmail.com> writes:

> From: Yann Diorcet <yann.diorcet@belledonne-communications.com>
>
> Use sharedlibdir for library
> Remove EXTRA_OEMAKE: 
> 1) works without it
> 2) cause issue with mingw32 target OS
> ---
>  recipes/freetype/freetype.inc |    4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/recipes/freetype/freetype.inc b/recipes/freetype/freetype.inc
> index 3e5de75..ce722a9 100644
> --- a/recipes/freetype/freetype.inc
> +++ b/recipes/freetype/freetype.inc
> @@ -13,12 +13,10 @@ SRC_URI = "${SAVANNAH_MIRROR}/freetype/freetype-${PV}.tar.bz2"
>  
>  SRC_URI += "file://no-hardcode.patch"
>  
> -EXTRA_OEMAKE += "'LIBTOOL=${LIBTOOL}'"
> -
>  do_compile[postfuncs] += "do_compile_apinames"
>  do_compile_apinames() {
>  	${BUILD_CC} -o objs/apinames src/tools/apinames.c
>  }
>  
> -FILES_${PN} = "${libdir}/lib*${SOLIBS}"
> +FILES_${PN} = "${sharedlibdir}/lib*${SOLIBS}"
>  FILES_${PN}-dev += "${bindir}"

Merged to master, thanks.

/Esben

Patch

diff --git a/recipes/freetype/freetype.inc b/recipes/freetype/freetype.inc
index 3e5de75..ce722a9 100644
--- a/recipes/freetype/freetype.inc
+++ b/recipes/freetype/freetype.inc
@@ -13,12 +13,10 @@  SRC_URI = "${SAVANNAH_MIRROR}/freetype/freetype-${PV}.tar.bz2"
 
 SRC_URI += "file://no-hardcode.patch"
 
-EXTRA_OEMAKE += "'LIBTOOL=${LIBTOOL}'"
-
 do_compile[postfuncs] += "do_compile_apinames"
 do_compile_apinames() {
 	${BUILD_CC} -o objs/apinames src/tools/apinames.c
 }
 
-FILES_${PN} = "${libdir}/lib*${SOLIBS}"
+FILES_${PN} = "${sharedlibdir}/lib*${SOLIBS}"
 FILES_${PN}-dev += "${bindir}"