Skip to content

Commit

Permalink
Updated third-party patches to allow compiling on rhel3 again.
Browse files Browse the repository at this point in the history
  • Loading branch information
p3ck committed Dec 12, 2013
1 parent 244dce6 commit dcf9026
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 1 deletion.
3 changes: 2 additions & 1 deletion third-party/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -157,12 +157,13 @@ $(LIBXML2)/.patches-done:
touch $@

$(LIBARCHIVE)/.patches-done:
# patch -d$(LIBARCHIVE) -p1 <libarchive-rhel3-headers.patch
patch -d$(LIBARCHIVE) -p1 <libarchive-rhel3-headers.patch
patch -d$(LIBARCHIVE) -p1 <libarchive-use-pkgconfig.patch
touch $@

$(LIBSOUP)/.patches-done:
patch -d$(LIBSOUP) -p1 <libsoup-no-pkgconfig-version-check.patch
patch -d$(LIBSOUP) -p1 <libsoup-perl580.patch
touch $@

.PHONY: clean
Expand Down
19 changes: 19 additions & 0 deletions third-party/libsoup-perl580.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
diff -ur libsoup-2.42.2/configure libsoup-2.42.2.patched/configure
--- libsoup-2.42.2/configure 2013-04-24 11:40:04.000000000 -0400
+++ libsoup-2.42.2.patched/configure 2013-12-12 12:11:43.000000000 -0500
@@ -12874,11 +12874,11 @@
if test -z "$INTLTOOL_PERL"; then
as_fn_error $? "perl not found" "$LINENO" 5
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5
-$as_echo_n "checking for perl >= 5.8.1... " >&6; }
-$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.0" >&5
+$as_echo_n "checking for perl >= 5.8.0... " >&6; }
+$INTLTOOL_PERL -e "use 5.8.0;" > /dev/null 2>&1
if test $? -ne 0; then
- as_fn_error $? "perl 5.8.1 is required for intltool" "$LINENO" 5
+ as_fn_error $? "perl 5.8.0 is required for intltool" "$LINENO" 5
else
IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"`
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5

0 comments on commit dcf9026

Please sign in to comment.