mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-22 06:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

rpm: fix build with automake-1.11.2

Browse Source 
automake version 1.11.2 has made use of dir variables more strict.
the use of pkglibdir with SCRIPTS & DATA vars results in automake
errors.
  This commits uses pkgdatadir & pkgbindir vars instead of pkglibdir
to avoid the strict check errors.
  This change also works with automake-1.11.1

(From OE-Core rev: ca76443522a6bb38d239b9aa0c7932cd44446ff8)

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Nitin A Kamble
2011-12-27 12:47:59 -08:00
committed by Richard Purdie
parent 35c2d56218
commit 07d83910c2
2 changed files with 55 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
meta/recipes-devtools/rpm/rpm/fix_for_automake_1.11.2.patch Normal file
View File

@@ -0,0 +1,54 @@
Upstream-Status: Pending
automake version 1.11.2 has made use of dir variables more strict.
the use of pkglibdir with SCRIPTS & DATA vars results in automake
errors.
This commits uses pkgdatadir & pkgbindir vars instead of pkglibdir
to avoid the strict check errors.
This change also works with automake-1.11.1
Errors fixed:
Makefile.am:103: error: `pkglibdir' is not a legitimate directory for `DATA'
scripts/Makefile.am:47: error: `pkglibdir' is not a legitimate directory for `SCRIPTS'
Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
2011/12/27
Index: rpm-5.4.0/Makefile.am
===================================================================
--- rpm-5.4.0.orig/Makefile.am
+++ rpm-5.4.0/Makefile.am
@@ -103,13 +103,13 @@ if WITH_PATH_VERSIONED
done
endif
-pkglibdir = @USRLIBRPM@
-pkglib_DATA = rpmpopt macros/macros macros/macros.rpmbuild cpuinfo.yaml
+pkgdatadir = @USRLIBRPM@
+pkgdata_DATA = rpmpopt macros/macros macros/macros.rpmbuild cpuinfo.yaml
-pkgbindir = $(pkglibdir)/bin
+pkgbindir = $(pkgdatadir)/bin
pkgbin_SCRIPTS = install-sh mkinstalldirs
-pkgcfgdir = $(pkglibdir)/macros.d
+pkgcfgdir = $(pkgdatadir)/macros.d
pkgcfg_DATA = \
macros/cmake macros/java macros/libtool macros/mandriva macros/mono \
macros/perl macros/pkgconfig macros/php macros/python macros/ruby \
Index: rpm-5.4.0/scripts/Makefile.am
===================================================================
--- rpm-5.4.0.orig/scripts/Makefile.am
+++ rpm-5.4.0/scripts/Makefile.am
@@ -45,8 +45,8 @@ all:
bin_SCRIPTS = gendiff
-pkglibdir = @USRLIBRPM@
-pkglib_SCRIPTS = \
+pkgbindir = @USRLIBRPM@
+pkgbin_SCRIPTS = \
brp-compress brp-python-bytecompile brp-java-gcjcompile \
brp-strip brp-strip-comment-note brp-nobuildrootpath \
brp-strip-shared brp-strip-static-archive brp-sparc64-linux \

1
meta/recipes-devtools/rpm/rpm_5.4.0.bb
View File

@@ -66,6 +66,7 @@ SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.0-0.20101229.src.rpm;ex
file://rpm-canonarch.patch \
file://rpm-no-loopmsg.patch \
file://rpm-scriptletexechelper.patch \
file://fix_for_automake_1.11.2.patch \
file://pythondeps.sh \
"