diff options
| author | Stanislav Brabec <utx@penguin.cz> | 2010-07-05 02:41:51 +0000 |
|---|---|---|
| committer | utx@penguin.cz <utx@penguin.cz> | 2010-07-05 02:41:51 +0000 |
| commit | dafcd0c847c064b190f70262045547f9c05fd48d (patch) | |
| tree | 6aca81b125b838d03fc3e63f8043baa1f1f37d3d /recipes/mc | |
| parent | 85b584079faadac00b328fc512fa6cf01102a8a0 (diff) | |
mc: Prefer native libglib-2.0.so.0 over host one in runtime linking of man2hlp. Introduce INC_PR.
Diffstat (limited to 'recipes/mc')
| -rw-r--r-- | recipes/mc/mc.inc | 3 | ||||
| -rw-r--r-- | recipes/mc/mc_4.6.0.bb | 2 | ||||
| -rw-r--r-- | recipes/mc/mc_4.6.1.bb | 2 | ||||
| -rw-r--r-- | recipes/mc/mc_4.6.2.bb | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/recipes/mc/mc.inc b/recipes/mc/mc.inc index 508cb6eb88..db52b6b095 100644 --- a/recipes/mc/mc.inc +++ b/recipes/mc/mc.inc @@ -6,6 +6,7 @@ SECTION = "console/utils" PRIORITY = "optional" DEPENDS = "ncurses glib-2.0 glib-2.0-native" RDEPENDS_${PN} = "ncurses-terminfo" +INC_PR = "r5" SRC_URI = "http://www.ibiblio.org/pub/Linux/utils/file/managers/mc/mc-${PV}.tar.gz" @@ -32,7 +33,7 @@ PACKAGE_ARCH_${PN}-hilite = "all" export CC_FOR_BUILD = "${BUILD_CC}" export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}" -export LD_FOR_BUILD = "${BUILD_CC}" +export LD_FOR_BUILD = "${BUILD_CC} -Wl,-rpath -Wl,${STAGING_LIBDIR_NATIVE}" do_compile_prepend() { # FIXME: Ugly! Should be done globally with respect to the host system (in classes) instead of NATIVE_PKGCONFIG_PATH: export HOST_PKG_CONFIG_PATH= diff --git a/recipes/mc/mc_4.6.0.bb b/recipes/mc/mc_4.6.0.bb index bab50bb250..ecb667b523 100644 --- a/recipes/mc/mc_4.6.0.bb +++ b/recipes/mc/mc_4.6.0.bb @@ -1,5 +1,5 @@ require mc.inc -PR = "r3" +PR = "${INC_PR}.0" SRC_URI[md5sum] = "70804dc9e2049e24f294ff7090a82a12" SRC_URI[sha256sum] = "396a2de3eed6d5d3c4604b372e11f6c0f18644ef3d8ee14978b715ec26aa0974" diff --git a/recipes/mc/mc_4.6.1.bb b/recipes/mc/mc_4.6.1.bb index 87c0ad514e..86ea79d93a 100644 --- a/recipes/mc/mc_4.6.1.bb +++ b/recipes/mc/mc_4.6.1.bb @@ -1,5 +1,5 @@ require mc.inc -PR = "r3" +PR = "${INC_PR}.0" SRC_URI[md5sum] = "18b20db6e40480a53bac2870c56fc3c4" SRC_URI[sha256sum] = "086ab03daaac28a28c0ddb9a709040b59e1322f6bfa68e39d004d9c66b119e7e" diff --git a/recipes/mc/mc_4.6.2.bb b/recipes/mc/mc_4.6.2.bb index da49427ac8..85a2cce9e3 100644 --- a/recipes/mc/mc_4.6.2.bb +++ b/recipes/mc/mc_4.6.2.bb @@ -1,5 +1,5 @@ require mc.inc -PR = "r4" +PR = "${INC_PR}.0" HOMEPAGE = "http://www.midnight-commander.org/" # most of these fixes were copied from openSUSE Factory. |