[packages/hhvm] fix devel headers install, previous code copied all headers

glen glen at pld-linux.org
Fri Jan 3 09:55:59 CET 2014


commit 2a7c159cd58d306203b7957fa3fd782c6e9913b9
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Fri Jan 3 10:49:12 2014 +0200

    fix devel headers install, previous code copied all headers

 hhvm.spec | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)
---
diff --git a/hhvm.spec b/hhvm.spec
index 02cc5e5..e09d588 100644
--- a/hhvm.spec
+++ b/hhvm.spec
@@ -282,19 +282,29 @@ sed -e "
 oIFS=$IFS
 IFS=";"
 set -- $(sed -ne 's/set(HHVM_INCLUDE_DIRS "\(.*\)")/\1/p' hphp/tools/hphpize/hphpize.cmake)
-for dir in "$@"; do
-	case "$dir" in
-	$HPHP_HOME/?*)
-		find $dir -name '*.h' | while read file; do
-			install -Dp $file $RPM_BUILD_ROOT%{_includedir}${file#$HPHP_HOME}
-		done
-	;;
-	esac
-done
 IFS=$oIFS
-
-# fixup, broken due symlink
-mv $RPM_BUILD_ROOT%{_includedir}/hphp/{submodules/folly/folly,third_party}
+set -- $(
+	for dir in "$@"; do
+		[[ "$dir" = $HPHP_HOME/hphp/* ]] && echo $dir
+	done
+)
+
+set +x
+for dir in "$@" \
+	$HPHP_HOME/hphp/runtime \
+	$HPHP_HOME/hphp/util \
+	$HPHP_HOME/hphp/neo \
+	$HPHP_HOME/hphp/system \
+	$HPHP_HOME/hphp/parser \
+; do
+	echo "D %{_includedir}${dir#$HPHP_HOME}"
+	find $dir -name '*.h' | while read path; do
+		file=%{_includedir}${path#$HPHP_HOME}
+		echo "F $file"
+		install -Dp $path $RPM_BUILD_ROOT$file
+	done
+done
+set -x
 
 %clean
 rm -rf $RPM_BUILD_ROOT
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/hhvm.git/commitdiff/b05f3896914f0847c10e7b88ae3ca9cfa15569a5



More information about the pld-cvs-commit mailing list