diff options
| author | Anders F Bjorklund | 2013-11-13 21:00:14 +0100 |
|---|---|---|
| committer | Mike McQuaid | 2013-11-14 22:43:56 +0000 |
| commit | 6a72fa26aa49ee5c2bd256daca21351510f33616 (patch) | |
| tree | f371e6a0bde5408bf1d52517e3840657878e755f /Library | |
| parent | 3ac02fb33e9c93b84218c4a757c19f78f39af8ba (diff) | |
| download | homebrew-6a72fa26aa49ee5c2bd256daca21351510f33616.tar.bz2 | |
rpm: re-enable the db format, fix build with gcc
Make sure to link with db-5.3 instead of (the default) db-6.0.
Also account for the C++ experiments affecting the bin linkage.
Make the file magic path shorter, put db/sqlite next to another.
Closes #24272.
Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Formula/rpm.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Library/Formula/rpm.rb b/Library/Formula/rpm.rb index 0d0aba1d6..b07263d7c 100644 --- a/Library/Formula/rpm.rb +++ b/Library/Formula/rpm.rb @@ -41,13 +41,14 @@ class Rpm < Formula --prefix=#{prefix} --localstatedir=#{var} --with-path-cfg=#{etc}/rpm - --with-path-magic=#{HOMEBREW_PREFIX}/opt/libmagic/share/misc/magic + --with-path-magic=#{HOMEBREW_PREFIX}/share/misc/magic --with-extra-path-macros=#{lib}/rpm/macros.* --with-libiconv-prefix=/usr --disable-openmp --disable-nls --disable-dependency-tracking --with-db=external + --with-sqlite=external --with-file=external --with-popt=external --with-beecrypt=external @@ -56,13 +57,16 @@ class Rpm < Formula --with-uuid=external --with-pcre=external --with-lua=internal - --with-sqlite=external --with-syck=internal --without-apidocs varprefix=#{var} ] + inreplace "configure", "db-6.0", "db-5.3" + inreplace "configure", "db_sql-6.0", "db_sql-5.3" system "./configure", *args + inreplace "Makefile", "--tag=CC", "--tag=CXX" + inreplace "Makefile", "--mode=link $(CCLD)", "--mode=link $(CXX)" system "make" system "make install" end |