diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 8768f2202b..8b753f665a 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,16 @@ The license applies to all entries newer than 2009-04-28. */ +2010-09-13 13:13 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/contrib/hbqt/hbqt_common.hbm + ! respect HB_BUILD_EXTDEF=no + + * harbour/package/harbour-win.spec.in + * harbour/package/harbour-wce.spec.in + ! removed HB_BUILD_EXTDEF=no which is not necessary -my fault + ; TOFIX: now windows builds need HB_INSTALL_PREFIX so these RPMs + still cannot be created. + 2010-09-13 12:12 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/package/harbour-win.spec.in * harbour/package/harbour-wce.spec.in diff --git a/harbour/contrib/hbqt/hbqt_common.hbm b/harbour/contrib/hbqt/hbqt_common.hbm index 2460171880..c5ac8db0f2 100644 --- a/harbour/contrib/hbqt/hbqt_common.hbm +++ b/harbour/contrib/hbqt/hbqt_common.hbm @@ -25,6 +25,7 @@ -plugin=hbqt_hbmk2_plugin.hbs -depkeyhead=qt:QtCore/qglobal.h +-depcontrol=qt:no{HB_BUILD_EXTDEF='no'} -depcontrol=qt:${HB_WITH_QT} {!darwin}-depincpath=qt:/usr/include/qt4 {!darwin}-depincpath=qt:/usr/lib/qt4/include diff --git a/harbour/package/harbour-wce.spec.in b/harbour/package/harbour-wce.spec.in index cc74e76ce1..4df1ebe28c 100644 --- a/harbour/package/harbour-wce.spec.in +++ b/harbour/package/harbour-wce.spec.in @@ -83,7 +83,6 @@ unset HB_BUILD_CONTRIBS export HB_BUILD_PARTS=lib export HB_PLATFORM=wce export HB_HOST_BIN="$(pwd)/bin/linux/gcc" -export HB_BUILD_EXTDEF=no make %{?_smp_mflags} @@ -100,7 +99,6 @@ unset HB_COMPILER export HB_BUILD_PARTS=lib export HB_PLATFORM=wce export HB_HOST_BIN="$(pwd)/bin/linux/gcc" -export HB_BUILD_EXTDEF=no export HB_INSTALL_PKG_ROOT=${RPM_BUILD_ROOT} export HB_INSTALL_BIN=${RPM_BUILD_ROOT}/%{_bindir} diff --git a/harbour/package/harbour-win.spec.in b/harbour/package/harbour-win.spec.in index 35a55b042a..3848510fd5 100644 --- a/harbour/package/harbour-win.spec.in +++ b/harbour/package/harbour-win.spec.in @@ -83,7 +83,6 @@ unset HB_BUILD_CONTRIBS export HB_BUILD_PARTS=lib export HB_PLATFORM=win export HB_HOST_BIN="$(pwd)/bin/linux/gcc" -export HB_BUILD_EXTDEF=no make %{?_smp_mflags} @@ -100,7 +99,6 @@ unset HB_COMPILER export HB_BUILD_PARTS=lib export HB_PLATFORM=win export HB_HOST_BIN="$(pwd)/bin/linux/gcc" -export HB_BUILD_EXTDEF=no export HB_INSTALL_PKG_ROOT=${RPM_BUILD_ROOT} export HB_INSTALL_BIN=${RPM_BUILD_ROOT}/%{_bindir}