diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 1c2608bf54..124c137072 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,18 @@ 2008-12-31 13:59 UTC+0100 Foo Bar */ +2008-08-07 12:55 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/harbour-ce-spec + * harbour/harbour-w32-spec + * harbour/harbour.spec + ! added hbextern library + + * harbour/harbour.spec + * removed dependences on ncurses (--without gtcrs) + + * harbour/make_rpm.sh + * added automatic ncurses detection + 2008-08-07 11:58 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * source/pp/hbpp.c * utils/hbrun/hbrun.prg diff --git a/harbour/harbour-ce-spec b/harbour/harbour-ce-spec index 76847c91c2..24cd282dd3 100644 --- a/harbour/harbour-ce-spec +++ b/harbour/harbour-ce-spec @@ -317,6 +317,7 @@ rm -fR $RPM_BUILD_ROOT %{_libdir}/%{name}/libhbmacro.a %{_libdir}/%{name}/libhbpcre.a %{_libdir}/%{name}/libhbzlib.a +%{_libdir}/%{name}/libhbextern.a %{_libdir}/%{name}/libhbnulrdd.a %{_libdir}/%{name}/libhbpp.a %{_libdir}/%{name}/libhbrdd.a diff --git a/harbour/harbour-w32-spec b/harbour/harbour-w32-spec index 505ac4c499..a62e42a938 100644 --- a/harbour/harbour-w32-spec +++ b/harbour/harbour-w32-spec @@ -317,6 +317,7 @@ rm -fR $RPM_BUILD_ROOT %{_libdir}/%{name}/libhbmacro.a %{_libdir}/%{name}/libhbpcre.a %{_libdir}/%{name}/libhbzlib.a +%{_libdir}/%{name}/libhbextern.a %{_libdir}/%{name}/libhbnulrdd.a %{_libdir}/%{name}/libhbpp.a %{_libdir}/%{name}/libhbrdd.a diff --git a/harbour/harbour.spec b/harbour/harbour.spec index 358c5487e1..2134b76786 100644 --- a/harbour/harbour.spec +++ b/harbour/harbour.spec @@ -24,6 +24,7 @@ # --without gpllib - do not build libs which needs GPL 3-rd party code # --without x11 - do not build GTXWC # --without gpm - build GTTRM, GTSLN and GTCRS without GPM support +# --without gtcrs - do not build GTCRS # --without gtsln - do not build GTSLN ###################################################################### @@ -71,6 +72,7 @@ %define hb_gt export HB_GT_LIB=gttrm %define hb_defgt export HB_GT_DEFAULT="${HB_GT_DEFAULT}" %define hb_gpm export HB_GPM_MOUSE=%{!?_without_gpm:yes} +%define hb_crs export HB_WITHOUT_GTCRS=%{?_without_gtcrs:yes} %define hb_sln export HB_WITHOUT_GTSLN=%{?_without_gtsln:yes} %define hb_x11 export HB_WITHOUT_X11=%{?_without_x11:yes} %define hb_bdir export HB_BIN_INSTALL=%{_bindir} @@ -79,7 +81,7 @@ %define hb_opt export HB_GTALLEG=%{?_with_allegro:yes} %define hb_cmrc export HB_COMMERCE=%{?_without_gpllib:yes} %define hb_ctrb export HB_CONTRIBLIBS="hbct hbmzip hbtip xhb hbbtree hbmisc hbvpdf hbgt hbbmcdx hbclipsm %{!?_without_nf:hbnf} %{?_with_odbc:hbodbc} %{?_with_curl:hbcurl} %{?_with_ads:rddads} %{?_with_gd:hbgd} %{?_with_pgsql:hbpgsql} %{?_with_mysql:hbmysql}" -%define hb_env %{hb_arch} ; %{hb_cc} ; %{hb_cflag} ; %{hb_lflag} ; %{hb_mt} ; %{hb_gt} ; %{hb_defgt} ; %{hb_gpm} ; %{hb_sln} ; %{hb_x11} ; %{hb_bdir} ; %{hb_idir} ; %{hb_ldir} ; %{hb_opt} ; %{hb_ctrb} ; %{hb_cmrc} +%define hb_env %{hb_arch} ; %{hb_cc} ; %{hb_cflag} ; %{hb_lflag} ; %{hb_mt} ; %{hb_gt} ; %{hb_defgt} ; %{hb_gpm} ; %{hb_crs} ; %{hb_sln} ; %{hb_x11} ; %{hb_bdir} ; %{hb_idir} ; %{hb_ldir} ; %{hb_opt} ; %{hb_ctrb} ; %{hb_cmrc} %define hb_host www.harbour-project.org %define readme README.RPM ###################################################################### @@ -100,7 +102,7 @@ Vendor: %{hb_host} URL: http://%{hb_host}/ Source: %{name}-%{version}.src.tar.gz Packager: Przemysław Czerpak Luiz Rafael Culik Guimaraes -BuildPrereq: gcc binutils bash ncurses ncurses-devel %{!?_without_gpm: gpm-devel} +BuildPrereq: gcc binutils bash %{!?_without_gtcrs: ncurses-devel} %{!?_without_gpm: gpm-devel} Requires: gcc binutils bash sh-utils %{name}-lib = %{?epoch:%{epoch}:}%{version}-%{release} Provides: %{name} harbour BuildRoot: /tmp/%{name}-%{version}-root @@ -383,6 +385,7 @@ mkdir -p $HB_LIB_INSTALL make -r -i install [ "%{?_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. @@ -406,7 +409,7 @@ EOF if [ "%{!?_with_static:1}" ] then unset HB_GTALLEG - export L_USR="${CC_L_USR} -L${HB_LIB_INSTALL} -l%{name} -lncurses %{!?_without_gtsln:-lslang} %{!?_without_gpm:-lgpm} %{!?_without_x11:-L/usr/X11R6/%{_lib} -lX11}" + export L_USR="${CC_L_USR} -L${HB_LIB_INSTALL} -l%{name} %{!?_without_gtcrs:-lncurses} %{!?_without_gtsln:-lslang} %{!?_without_gpm:-lgpm} %{!?_without_x11:-L/usr/X11R6/%{_lib} -lX11}" export PRG_USR="\"-D_DEFAULT_INC_DIR='${_DEFAULT_INC_DIR}'\" ${PRG_USR}" for utl in hbmake hbrun hbdoc @@ -603,6 +606,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/%{name}/libhbmacro.a %{_libdir}/%{name}/libhbpcre.a %{_libdir}/%{name}/libhbzlib.a +%{_libdir}/%{name}/libhbextern.a %{_libdir}/%{name}/libhbnulrdd.a %{_libdir}/%{name}/libhbpp.a %{_libdir}/%{name}/libhbrdd.a diff --git a/harbour/make_rpm.sh b/harbour/make_rpm.sh index 72f48f0703..f7c0920cfb 100755 --- a/harbour/make_rpm.sh +++ b/harbour/make_rpm.sh @@ -24,6 +24,7 @@ # --without x11 - do not build GTXWC # --without gpm - build GTSLN and GTCRS without GPM support # --without gtsln - do not build GTSLN +# --without gtcrs - do not build GTCRS ###################################################################### test_reqrpm() @@ -51,7 +52,7 @@ get_rpmmacro() echo -n "${R}" } -NEED_RPM="make gcc binutils bash ncurses ncurses-devel" +NEED_RPM="make gcc binutils bash" FORCE="" BUGGY_RPM="" @@ -123,6 +124,14 @@ if ! test_reqrpm "XFree86-devel" then INST_PARAM="${INST_PARAM} --without X11" fi +if ! test_reqrpm ncurses || ! test_reqrpm ncurses-devel +then + INST_PARAM="${INST_PARAM} --without gtcrs" +fi +if ! test_reqrpm slang || ! test_reqrpm slang-devel +then + INST_PARAM="${INST_PARAM} --without gtsln" +fi TOINST_LST="" for i in ${NEED_RPM}