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 Homebrew/homebrew#24272.

Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
This commit is contained in:
Anders F Bjorklund 2013-11-13 21:00:14 +01:00 committed by Mike McQuaid
parent 3393737d7d
commit 5f6289ffa0

View file

@ -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