diff options
author | Florian Boor <florian.boor@kernelconcepts.de> | 2006-08-07 11:11:46 +0000 |
---|---|---|
committer | Florian Boor <florian.boor@kernelconcepts.de> | 2006-08-07 11:11:46 +0000 |
commit | 298dd441a0efb859be6fc0da4b3ae069e3b1de3f (patch) | |
tree | 32c081aca477ae67b953f441331ccb186654e009 /packages/zlib/zlib_1.2.3.bb | |
parent | af5f0bd309b34453fcc397c05ed34c33f53f33ef (diff) | |
parent | 578337a073332bac0da58ce23ded325ae294b035 (diff) |
merge of 70cd861a84040db0f14008d8552b1f2dbc5c8084
and a7904b535294d222e83d153c9fc22b575a5952c4
Diffstat (limited to 'packages/zlib/zlib_1.2.3.bb')
-rw-r--r-- | packages/zlib/zlib_1.2.3.bb | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/packages/zlib/zlib_1.2.3.bb b/packages/zlib/zlib_1.2.3.bb index c7a72c9107..8a48a89fdf 100644 --- a/packages/zlib/zlib_1.2.3.bb +++ b/packages/zlib/zlib_1.2.3.bb @@ -7,7 +7,8 @@ LICENSE = "zlib" SRC_URI = "http://www.zlib.net/zlib-1.2.3.tar.bz2 \ file://visibility.patch;patch=1 \ - file://libtool_staging.patch;patch=1" + file://libtool_staging.patch;patch=1 \ + file://sane-target.patch;patch=1 " S = "${WORKDIR}/zlib-${PV}" @@ -19,9 +20,13 @@ CFLAGS_prepend = "-fPIC -DZLIB_DLL " AR_append = " rc" EXTRA_OEMAKE = " LIBTOOL=${TARGET_SYS}-libtool" +# extra configure options, can be reset in the -native variant +ZLIB_EXTRA = "--target=${TARGET_OS}" +ZLIB_SHARED= "libz.so.${PV}" + do_compile() { - ./configure --prefix=${prefix} --exec_prefix=${exec_prefix} --shared --libdir=${libdir} --includedir=${includedir} - oe_runmake -e MAKEFLAGS="" libz.so.${PV} libz.a + ./configure --prefix=${prefix} --exec_prefix=${exec_prefix} --shared --libdir=${libdir} --includedir=${includedir} ${ZLIB_EXTRA} + oe_runmake -e MAKEFLAGS="" ${ZLIB_SHARED} libz.a } do_stage() { |