[gccsdk] Patch to move add_headers() to build-program

Index: build-program
===================================================================
--- build-program (revision 7220)
+++ build-program (working copy)
@@ -207,6 +207,33 @@
done
}

+ab_add_headers() {
+ local src_header_dir
+ local dst_header_dir
+ local f
+ local HERE
+
+ src_header_dir=$1
+ dst_header_dir=$2
+
+ HERE=`pwd`
+ cd $src_header_dir
+
+ mkdir -p $dst_header_dir/h
+ for f in *
+ do
+ if [ -d "$f" ] ; then
+ ab_add_headers $src_header_dir/$f $dst_header_dir/$f
+ else
+ filename=$(basename "$f")
+ filename="${filename%.*}"
+ cp -v -T $f $dst_header_dir/h/$filename
+ fi
+ done
+
+ cd $HERE
+}
+
ab_create_sharedlib_skeleton() {
local package

Index: libraries/icu/setvars
===================================================================
--- libraries/icu/setvars (revision 7220)
+++ libraries/icu/setvars (working copy)
@@ -46,29 +46,6 @@
popd > /dev/null
}

-add_headers()
-{
- local src_header_dir
- local dst_header_dir
-
- src_header_dir=$1
- dst_header_dir=$2
-
- HERE=`pwd`
- cd $src_header_dir
-
- mkdir -p $dst_header_dir/h
- for f in *.h
- do
- filename=$(basename "$f")
- filename="${filename%.*}"
- echo cp -T $f $dst_header_dir/h/$filename
- cp -T $f $dst_header_dir/h/$filename
- done
-
- cd $HERE
-}
-
# "make distclean" appears to be broken; it wipes files that subsequent
# makefiles still require, so create our own version. This will be called
# by ab_package_source.
@@ -84,8 +61,8 @@

mkdir -p $A/include/layout $A/include/unicode $A/lib $A/docs

- add_headers $GCCSDK_INSTALL_ENV/include/layout $A/include/layout
- add_headers $GCCSDK_INSTALL_ENV/include/unicode $A/include/unicode
+ ab_add_headers $GCCSDK_INSTALL_ENV/include/layout $A/include/layout
+ ab_add_headers $GCCSDK_INSTALL_ENV/include/unicode $A/include/unicode

cp $GCCSDK_INSTALL_ENV/lib/libicudata.a $A/lib
cp $GCCSDK_INSTALL_ENV/lib/libicui18n.a $A/lib
Index: libraries/libssl1.0.2/setvars
===================================================================
--- libraries/libssl1.0.2/setvars (revision 7220)
+++ libraries/libssl1.0.2/setvars (working copy)
@@ -90,37 +90,10 @@
popd > /dev/null
}

-add_headers()
-{
- local src_header_dir
- local dst_header_dir
-
- src_header_dir=$1
- dst_header_dir=$2
-
- HERE=`pwd`
- cd $src_header_dir
-
- mkdir -p $dst_header_dir/h
- for f in *
- do
- if [ -d "$f" ] ; then
- add_headers $src_header_dir/$f $dst_header_dir/$f
- else
- filename=$(basename "$f")
- extension="${filename##*.}"
- filename="${filename%.*}"
- cp -v -T $f $dst_header_dir/h/$filename
- fi
- done
-
- cd $HERE
-}
-
ab_package() {
ab_create_command_app LibSSL Apps/Library libssl-dev

- add_headers $GCCSDK_INSTALL_ENV/include/openssl $A
+ ab_add_headers $GCCSDK_INSTALL_ENV/include/openssl $A
cp $S/static-build/*.a $A

touch $S/Makefile
Index: libraries/sdl/libsdl2/setvars
===================================================================
--- libraries/sdl/libsdl2/setvars (revision 7220)
+++ libraries/sdl/libsdl2/setvars (working copy)
@@ -20,34 +20,6 @@
$AB_CONFIG --prefix=$GCCSDK_INSTALL_ENV/vfp --enable-video-opengles --disable-video-x11 \
--disable-file --disable-haptic --enable-audio --enable-oss

-add_headers()
-{
- local src_header_dir
- local dst_header_dir
- local f
- local HERE
-
- src_header_dir=$1
- dst_header_dir=$2
-
- HERE=`pwd`
- cd $src_header_dir
-
- mkdir -p $dst_header_dir/h
- for f in *
- do
- if [ -d "$f" ] ; then
- add_headers $src_header_dir/$f $dst_header_dir/$f
- else
- filename=$(basename "$f")
- filename="${filename%.*}"
- cp -v -T $f $dst_header_dir/h/$filename
- fi
- done
-
- cd $HERE
-}
-
ab_package() {
if [ "$RO_SHAREDLIBS" == "yes" ] ; then
ab_create_sharedlib_skeleton libsdl2
@@ -61,7 +33,7 @@

ab_create_app LibSDL2 Apps/Library libsdl2-dev

- add_headers $GCCSDK_INSTALL_ENV/vfp/include/SDL2 $A/SDL2
+ ab_add_headers $GCCSDK_INSTALL_ENV/vfp/include/SDL2 $A/SDL2
if [ -d "$S/build/.libs/" ]; then
cp -f $S/build/.libs/*.a $A
else
Index: media/libvorbis0a/setvars
===================================================================
--- media/libvorbis0a/setvars (revision 7220)
+++ media/libvorbis0a/setvars (working copy)
@@ -31,34 +31,6 @@
:
}

-add_headers()
-{
- local src_header_dir
- local dst_header_dir
- local f
- local HERE
-
- src_header_dir=$1
- dst_header_dir=$2
-
- HERE=`pwd`
- cd $src_header_dir
-
- mkdir -p $dst_header_dir/h
- for f in *
- do
- if [ -d "$f" ] ; then
- add_headers $src_header_dir/$f $dst_header_dir/$f
- else
- filename=$(basename "$f")
- filename="${filename%.*}"
- cp -v -T $f $dst_header_dir/h/$filename
- fi
- done
-
- cd $HERE
-}
-
ab_package() {
if [ "$RO_SHAREDLIBS" == "yes" ] ; then
if [ "$BUILD_NORMAL" == "yes" ] ; then
@@ -87,7 +59,7 @@

ab_create_app LibVorbis Apps/Library libvorbis-dev

- add_headers $GCCSDK_INSTALL_ENV/include/vorbis $A/vorbis
+ ab_add_headers $GCCSDK_INSTALL_ENV/include/vorbis $A/vorbis

if [ "$BUILD_NORMAL" == "yes" ] ; then
if [ -d "$S/build/lib/.libs/" ]; then
Index: system/khronos/setvars
===================================================================
--- system/khronos/setvars (revision 7220)
+++ system/khronos/setvars (working copy)
@@ -1,9 +1,14 @@
AB_GIT=https://github.com/raspberrypi/userland

AB_PVERSION=1.03
-AB_PACKAGES="khronos khronos-lib khronos-dev khronos-examples"
AB_ARCHITECTURE=rpi

+if [ "$RO_SHAREDLIBS" == "yes" ] ; then
+AB_PACKAGES="khronos khronos-lib khronos-dev khronos-examples"
+else
+AB_PACKAGES="khronos khronos-dev khronos-examples"
+fi
+
AB_PRECONF=:

mkdir -p $S/../bcm_host \
@@ -80,34 +85,6 @@
( cd wimp_test; $AB_MAKE )
}

-add_headers()
-{
- local src_header_dir
- local dst_header_dir
- local f
- local HERE
-
- src_header_dir=$1
- dst_header_dir=$2
-
- HERE=`pwd`
- cd $src_header_dir
-
- mkdir -p $dst_header_dir/h
- for f in *
- do
- if [ -d "$f" ] ; then
- add_headers $src_header_dir/$f $dst_header_dir/$f
- else
- filename=$(basename "$f")
- filename="${filename%.*}"
- cp -v -T $f $dst_header_dir/h/$filename
- fi
- done
-
- cd $HERE
-}
-
ab_package() {
if [ "$RO_SHAREDLIBS" == "yes" ] ; then
ab_create_sharedlib_skeleton khronos-lib
@@ -185,14 +162,14 @@
AB_COMPONENTS=""
ab_create_app Khronos Apps/Library khronos-dev

- add_headers $GCCSDK_INSTALL_ENV/vfp/include/EGL $A/EGL
- add_headers $GCCSDK_INSTALL_ENV/vfp/include/GLES $A/GLES
- add_headers $GCCSDK_INSTALL_ENV/vfp/include/GLES2 $A/GLES2
- add_headers $GCCSDK_INSTALL_ENV/vfp/include/VG $A/VG
- add_headers $GCCSDK_INSTALL_ENV/vfp/include/WF $A/WF
- add_headers $GCCSDK_INSTALL_ENV/vfp/include/KHR $A/KHR
- add_headers $GCCSDK_INSTALL_ENV/vfp/include/vcinclude $A/vcinclude
- add_headers $GCCSDK_INSTALL_ENV/vfp/include/interface $A/interface
+ ab_add_headers $GCCSDK_INSTALL_ENV/vfp/include/EGL $A/EGL
+ ab_add_headers $GCCSDK_INSTALL_ENV/vfp/include/GLES $A/GLES
+ ab_add_headers $GCCSDK_INSTALL_ENV/vfp/include/GLES2 $A/GLES2
+ ab_add_headers $GCCSDK_INSTALL_ENV/vfp/include/VG $A/VG
+ ab_add_headers $GCCSDK_INSTALL_ENV/vfp/include/WF $A/WF
+ ab_add_headers $GCCSDK_INSTALL_ENV/vfp/include/KHR $A/KHR
+ ab_add_headers $GCCSDK_INSTALL_ENV/vfp/include/vcinclude $A/vcinclude
+ ab_add_headers $GCCSDK_INSTALL_ENV/vfp/include/interface $A/interface

# Remove empty directories created above.
rmdir $A/interface/h

Hi

This patch moves the various implementations of add_headers to build-program in an attempt to reduce duplication between recipes.

Regards

Cameron