rpms/hivex
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Include autoconf generated changes.

Browse Source
This commit is contained in:
Richard W.M. Jones 2011-10-24 18:26:08 +01:00
parent 68a20dab23
commit 03c8b9bf04
2 changed files with 41 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
0001-Fix-conditional-test-for-HAVE_HIVEXSH-autoconf.patch Normal file
View File

@ -0,0 +1,36 @@
Only in hivex-1.3.2: autom4te.cache
diff -ur hivex-1.3.2.old/configure hivex-1.3.2/configure
--- hivex-1.3.2.old/configure 2011-10-24 17:22:58.000000000 +0100
+++ hivex-1.3.2/configure 2011-10-24 18:24:55.328126051 +0100
@@ -21859,13 +21859,12 @@
-for ac_func in bindtextdomain open_memstream
+for ac_func in bindtextdomain
do :
- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+ ac_fn_c_check_func "$LINENO" "bindtextdomain" "ac_cv_func_bindtextdomain"
+if test "x$ac_cv_func_bindtextdomain" = xyes; then :
cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_BINDTEXTDOMAIN 1
_ACEOF
fi
@@ -24131,7 +24130,12 @@
- if test "x$HAVE_OPEN_MEMSTREAM" = "xyes"; then
+ac_fn_c_check_func "$LINENO" "open_memstream" "ac_cv_func_open_memstream"
+if test "x$ac_cv_func_open_memstream" = xyes; then :
+
+fi
+
+ if test "x$ac_cv_func_open_memstream" = "xyes"; then
HAVE_HIVEXSH_TRUE=
HAVE_HIVEXSH_FALSE='#'
else

7
hivex.spec
View File

@ -7,7 +7,7 @@
Name: hivex Name: hivex
Version: 1.3.2 Version: 1.3.2
Release: 2%{?dist} Release: 3%{?dist}
Summary: Read and write Windows Registry binary hive files Summary: Read and write Windows Registry binary hive files
Group: Development/Libraries Group: Development/Libraries
@ -41,7 +41,9 @@ Conflicts: libguestfs <= 1:1.0.84
Patch0: %{name}-1.2.3-dirs.patch Patch0: %{name}-1.2.3-dirs.patch
# Upstream patch to fix building hivexsh, hivexget commands. # Upstream patch to fix building hivexsh, hivexget commands.
# Second patch is autoconf generated changes.
Patch1: 0001-Fix-conditional-test-for-HAVE_HIVEXSH.patch Patch1: 0001-Fix-conditional-test-for-HAVE_HIVEXSH.patch
Patch2: 0001-Fix-conditional-test-for-HAVE_HIVEXSH-autoconf.patch
%description %description
@ -167,6 +169,7 @@ ruby-%{name} contains Ruby bindings for %{name}.
%patch0 -p1 -b .dirs %patch0 -p1 -b .dirs
%patch1 -p1 %patch1 -p1
%patch2 -p1
%build %build
@ -279,7 +282,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Mon Oct 24 2011 Richard W.M. Jones <rjones@redhat.com> - 1.3.2-2 * Mon Oct 24 2011 Richard W.M. Jones <rjones@redhat.com> - 1.3.2-3
- New upstream version 1.3.2. - New upstream version 1.3.2.
- Add upstream patch to fix building of hivexsh, hivexget. - Add upstream patch to fix building of hivexsh, hivexget.