fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2009-09-21 12:54 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* harbour-win-spec
  * harbour-wce-spec
  * harbour.spec
    % Using HB_BUILD_STRIP instead of stripping locally.

  * harbour.spec
    % Using HB_BUILD_SHARED instead of rebuilding tools locally.
    * Changed 'make -i' to 'make' to sync with other spec files.
This commit is contained in:
Viktor Szakats
2009-09-21 10:55:37 +00:00
parent 64bb552abd
commit c0db32322f
4 changed files with 15 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
harbour/ChangeLog
View File

@@ -17,6 +17,16 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-09-21 12:54 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* harbour-win-spec
* harbour-wce-spec
* harbour.spec
% Using HB_BUILD_STRIP instead of stripping locally.
* harbour.spec
% Using HB_BUILD_SHARED instead of rebuilding tools locally.
* Changed 'make -i' to 'make' to sync with other spec files.
2009-09-21 12:41 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* external/libpng/LICENSE
! Missed one file from prev.

4
harbour/harbour-wce-spec
View File

@@ -128,6 +128,7 @@ export HB_BIN_INSTALL=$RPM_BUILD_ROOT/$HB_BIN_INSTALL
export HB_INC_INSTALL=$RPM_BUILD_ROOT/$HB_INC_INSTALL
export HB_LIB_INSTALL=$RPM_BUILD_ROOT/$HB_LIB_INSTALL
export HB_DYN_INSTALL=${HB_LIB_INSTALL}
export HB_BUILD_STRIP=lib
mkdir -p $HB_BIN_INSTALL
@@ -138,9 +139,6 @@ make install %{?_smp_mflags}
[ "%{?_with_ads:1}" ] || rm -f $HB_LIB_INSTALL/librddads.a
[ "%{?_without_nf:1}" ] && rm -f $HB_LIB_INSTALL/libhbnf.a
# Keep the size of the libraries to a minimim.
%{__strip} --strip-debug $HB_LIB_INSTALL/*
# remove unused files
rm -fR ${HB_BIN_INSTALL}/{harbour,hbpp,hbmk2,hbrun,hbi18n,hbtest}.exe

4
harbour/harbour-win-spec
View File

@@ -128,6 +128,7 @@ export HB_BIN_INSTALL=$RPM_BUILD_ROOT/$HB_BIN_INSTALL
export HB_INC_INSTALL=$RPM_BUILD_ROOT/$HB_INC_INSTALL
export HB_LIB_INSTALL=$RPM_BUILD_ROOT/$HB_LIB_INSTALL
export HB_DYN_INSTALL=${HB_LIB_INSTALL}
export HB_BUILD_STRIP=lib
mkdir -p $HB_BIN_INSTALL
@@ -138,9 +139,6 @@ make install %{?_smp_mflags}
[ "%{?_with_ads:1}" ] || rm -f $HB_LIB_INSTALL/librddads.a
[ "%{?_without_nf:1}" ] && rm -f $HB_LIB_INSTALL/libhbnf.a
# Keep the size of the libraries to a minimim.
%{__strip} --strip-debug $HB_LIB_INSTALL/*
# remove unused files
rm -fR ${HB_BIN_INSTALL}/{harbour,hbpp,hbmk2,hbrun,hbi18n,hbtest}.exe

25
harbour/harbour.spec
View File

@@ -398,22 +398,19 @@ export _DEFAULT_LIB_DIR=$HB_LIB_INSTALL
export HB_BIN_INSTALL=$RPM_BUILD_ROOT/$HB_BIN_INSTALL
export HB_INC_INSTALL=$RPM_BUILD_ROOT/$HB_INC_INSTALL
export HB_LIB_INSTALL=$RPM_BUILD_ROOT/$HB_LIB_INSTALL
export HB_BUILD_STRIP=all
export HB_BUILD_SHARED=%{!?_with_static:yes}
mkdir -p $HB_BIN_INSTALL
mkdir -p $HB_INC_INSTALL
mkdir -p $HB_LIB_INSTALL
make -i install %{?_smp_mflags}
make install %{?_smp_mflags}
[ "%{?_with_allegro:1}" ] || rm -f $HB_LIB_INSTALL/libgtalleg.a
[ "%{?_without_gtcrs:1}" ] && rm -f $HB_LIB_INSTALL/libgtcrs.a
[ "%{?_without_gtsln:1}" ] && rm -f $HB_LIB_INSTALL/libgtsln.a
# Keep the size of the binaries to a minimim.
strip $HB_BIN_INSTALL/harbour
# Keep the size of the libraries to a minimim.
strip --strip-debug $HB_LIB_INSTALL/*
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
install -m644 doc/man/*.1* $RPM_BUILD_ROOT%{_mandir}/man1/
@@ -426,22 +423,6 @@ VERBOSE=YES
DELTMP=YES
EOF
# check if we should rebuild tools with shared libs
if [ "%{!?_with_static:1}" ]
then
export HB_USER_LDFLAGS="${CC_HB_USER_LDFLAGS} -L${HB_LIB_INSTALL} -l%{name}"
export HB_USER_PRGFLAGS="\"-D_DEFAULT_INC_DIR='${_DEFAULT_INC_DIR}'\" ${HB_USER_PRGFLAGS}"
for utl in hbmk2 hbrun hbi18n hbformat
do
pushd utils/${utl}
rm -fR "./${HB_PLATFORM}/${HB_COMPILER}"
make install
strip ${HB_BIN_INSTALL}/${utl}
popd
done
fi
# remove unused files
rm -f ${HB_BIN_INSTALL}/hbtest