diff options
| author | Al Stone <ahs3@redhat.com> | 2013-01-03 10:47:04 -0700 |
|---|---|---|
| committer | Al Stone <ahs3@redhat.com> | 2013-01-03 10:47:04 -0700 |
| commit | 81e39c8a97377e6a75f8f554bb2d3cd3aa314e3d (patch) | |
| tree | 46bd43f904194d9e0ea3ed0bd759eba2c969be3c | |
| parent | 49bcf7c42575f47da81d73594c9d00f0cb55536e (diff) | |
| parent | 3ecb1ee2da658aa59a1512bef0d0b49161beb257 (diff) | |
| download | bootstrap.git.DONOTUSE-81e39c8a97377e6a75f8f554bb2d3cd3aa314e3d.tar.gz bootstrap.git.DONOTUSE-81e39c8a97377e6a75f8f554bb2d3cd3aa314e3d.tar.xz bootstrap.git.DONOTUSE-81e39c8a97377e6a75f8f554bb2d3cd3aa314e3d.zip | |
Merge branch 'aarch64-ahs3'
| -rw-r--r-- | recipe.d/0035-redhat-rpm-config | 2 | ||||
| -rw-r--r-- | recipe.d/0036-rpm | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/recipe.d/0035-redhat-rpm-config b/recipe.d/0035-redhat-rpm-config index 6ab3c38..7bbdd2b 100644 --- a/recipe.d/0035-redhat-rpm-config +++ b/recipe.d/0035-redhat-rpm-config @@ -6,4 +6,4 @@ cd $SRC/redhat-rpm-config-* make install - cp -p /usr/share/libtool/config/config.{guess,sub} /usr/lib${SUFFIX}/rpm/redhat/ + cp -p /usr/share/libtool/config/config.{guess,sub} /usr/lib/rpm/redhat/ diff --git a/recipe.d/0036-rpm b/recipe.d/0036-rpm index 80f670e..502f942 100644 --- a/recipe.d/0036-rpm +++ b/recipe.d/0036-rpm @@ -20,7 +20,8 @@ --host=armv7hl-redhat-linux-gnueabi \ --target=armv7hl-redhat-linux-gnueabi \ CPPFLAGS="-I/usr/include/nspr -I/usr/include/nss3" \ - --libdir=/usr/lib \ + --prefix=/usr \ + --libdir=/usr/lib64 \ --with-external-db \ --disable-static \ --without-lua \ |