2008-08-08 13:13 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

* harbour/bin/postinst.sh
    * use libtool instead of ar to create library on Darwin

  * harbour/make_tgz.sh
    * disabled self extracting shell envelop
This commit is contained in:
Przemyslaw Czerpak
2008-08-08 11:13:45 +00:00
parent dbdbd3d7c0
commit cb2323a9fe
3 changed files with 15 additions and 4 deletions

View File

@@ -8,6 +8,13 @@
2008-12-31 13:59 UTC+0100 Foo Bar <foo.bar@foobar.org>
*/
2008-08-08 13:13 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/bin/postinst.sh
* use libtool instead of ar to create library on Darwin
* harbour/make_tgz.sh
* disabled self extracting shell envelop
2008-08-08 11:17 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
* config/darwin/gcc.cf
! Added space after -o in CC_OUT to avoid a lot of

View File

@@ -47,13 +47,16 @@ then
RANLIB=""
MAKE=make
AR="${CCPREFIX}ar -cr"
AR_OPT=""
if [ "${HB_ARCHITECTURE}" = "bsd" ] || \
[ "${HB_ARCHITECTURE}" = "hpux" ] || \
[ `uname` = "FreeBSD" ]; then
MAKE=gmake
elif [ "${HB_ARCHITECTURE}" = "darwin" ]; then
# We must build an archive index on Darwin
AR="${CCPREFIX}ar -crs"
#AR="${CCPREFIX}ar -crs"
AR="libtool"
AR_OPT="-static ${LIBTOOL_USR} -o "
fi
if [ -n "${HB_TOOLS_PREF}" ]; then
@@ -83,12 +86,12 @@ then
C_USR=${C_USR//-DHB_FM_STATISTICS_OFF/}
rm -f fm.o
${MAKE} -r fm.o
${AR} ${HB_LIB_INSTALL}/libhbfm.a fm.o
${AR} ${AR_OPT} ${HB_LIB_INSTALL}/libhbfm.a fm.o
[ -n "${RANLIB}" ] && ${RANLIB} ${HB_LIB_INSTALL}/libhbfm.a
rm -f fm.o
if [ "${HB_MT}" = "MT" ]; then
${MAKE} -r fm.o 'HB_LIBCOMP_MT=YES'
${AR} ${HB_LIB_INSTALL}/libhbfmmt.a fm.o
${AR} ${AR_OPT} ${HB_LIB_INSTALL}/libhbfmmt.a fm.o
[ -n "${RANLIB}" ] && ${RANLIB} ${HB_LIB_INSTALL}/libhbfmmt.a
rm -f fm.o
fi

View File

@@ -22,7 +22,8 @@ hb_platform=`get_hbplatform`
[ "${hb_platform}" = "" ] || hb_platform="-${hb_platform}${HB_BUILDSUF}"
[ "${HB_XBUILD}" = "" ] || hb_platform="-${HB_XBUILD}"
hb_archfile="${name}-${hb_ver}${hb_platform}.bin.tar.gz"
hb_instfile="${name}-${hb_ver}${hb_platform}.inst.sh"
# disabled self extracting shell envelop
# hb_instfile="${name}-${hb_ver}${hb_platform}.inst.sh"
hb_lnkso="yes"
hb_pref="hb"
hb_contrib=""