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

2008-05-28 21:53 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

Browse Source 
* harbour/contrib/Makefile
    * respect HB_WITHOUT_ODBC and HB_WITHOUT_ADS envvars

  * harbour/debian/control
  * harbour/make_deb.sh
    * removed libncurses5-dev, libslang2-dev, libgpmg1-dev, libx11-dev and
      unixodbc-dev from dependences list.
    + added support for HB_COMMERCE=yes envvar
    + added automatic detection for curses, slang, gpm, x11 and odbc
      devel packages
    + added test for ACESDK detection - it tests if ach.h file exists
      in default user or system wide installation

    The above modifications are not tested and I would like to ask
    Debian/Ubuntu users to make necessary tests.
This commit is contained in:
Przemyslaw Czerpak
2008-05-28 19:53:26 +00:00
parent 20a09256ce
commit f900de7f0a
4 changed files with 71 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
harbour/ChangeLog
View File

@@ -8,6 +8,23 @@
2008-12-31 13:59 UTC+0100 Foo Bar <foo.bar@foobar.org>
*/
2008-05-28 21:53 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/contrib/Makefile
* respect HB_WITHOUT_ODBC and HB_WITHOUT_ADS envvars
* harbour/debian/control
* harbour/make_deb.sh
* removed libncurses5-dev, libslang2-dev, libgpmg1-dev, libx11-dev and
unixodbc-dev from dependences list.
+ added support for HB_COMMERCE=yes envvar
+ added automatic detection for curses, slang, gpm, x11 and odbc
devel packages
+ added test for ACESDK detection - it tests if ach.h file exists
in default user or system wide installation
The above modifications are not tested and I would like to ask
Debian/Ubuntu users to make necessary tests.
2008-05-28 18:42 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/source/hbzlib/ChangeLog
* harbour/source/hbzlib/zutil.c

43
harbour/contrib/Makefile
View File

@@ -16,49 +16,32 @@ DIRS=\
hbmzip \
# examples \
ifneq ($(HB_ARCHITECTURE),dos)
DIRS +=\
hbbmcdx \
DIRS += hbbmcdx
endif
ifeq ($(HB_ARCHITECTURE),w32)
DIRS +=\
rddads \
gtwvg \
DIRS += rddads gtwvg
ifneq ($(HB_COMPILER),rsxnt)
DIRS +=\
hbw32 \
hbodbc \
rddado \
DIRS += hbw32 hbodbc rddado
endif
endif
else
ifeq ($(HB_COMPILER),icc)
DIRS +=\
hbgf/os2pm \
DIRS += hbgf/os2pm
else
ifeq ($(HB_ARCHITECTURE),os2)
DIRS += hbgf/os2pm
endif
endif
DIRS +=\
hbgf/os2pm \
else
ifeq ($(HB_ARCHITECTURE),linux)
DIRS +=\
rddads \
hbodbc \
endif
ifneq ($(HB_WITHOUT_ODBC),yes)
DIRS += hbodbc
endif
ifneq ($(HB_WITHOUT_ADS),yes)
DIRS += rddads
endif
endif

2
harbour/debian/control
View File

@@ -2,7 +2,7 @@ Source: harbour
Section: devel
Priority: optional
Maintainer: Luis Mayoral <mayoral@linuxadicto.org>
Build-Depends: debhelper (>= 4.0.0), libncurses5-dev, libslang2-dev, libgpmg1-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libx11-dev, unixodbc-dev
Build-Depends: debhelper (>= 4.0.0), binutils, bash, gcc
Standards-Version: 3.6.2
Package: harbour

45
harbour/make_deb.sh
View File

@@ -16,23 +16,58 @@ test_reqpkg()
}
TOINST_LST=""
for i in gcc binutils bash debmake libncurses5-dev libslang2-dev libgpmg1-dev libx11-dev unixodbc-dev
for i in gcc binutils bash debhelper
do
test_reqpkg "$i" || TOINST_LST="${TOINST_LST} $i"
done
if [ "$HB_COMMERCE" = yes ]
then
export HB_GPM_MOUSE=no
export HB_WITHOUT_GTSLN=yes
else
if [ -z "$HB_GPM_MOUSE" ] && test_reqpkg libgpmg1-dev
then
export HB_GPM_MOUSE=yes
fi
if [ -z "$HB_WITHOUT_GTSLN" ] && test_reqpkg libslang2-dev
then
export HB_WITHOUT_GTSLN=yes
fi
fi
if [ -z "$HB_WITHOUT_GTCRS" ] && ! test_reqpkg libncurses5-dev
then
export HB_WITHOUT_GTCRS=yes
fi
if [ -z "$HB_WITHOUT_X11" ] && ! test_reqpkg libx11-dev
then
export HB_WITHOUT_X11=yes
fi
if [ -z "$HB_WITHOUT_ODBC" ] && ! test_reqpkg unixodbc-dev
then
export HB_WITHOUT_ODBC=yes
fi
if [ -z "$HB_WITHOUT_ADS" ] && \
! /usr/local/ads/acesdk/ace.h && \
! $(HOME)/ads/acesdk/ace.h
then
export HB_WITHOUT_ADS=yes
fi
if test_reqpkg libpq-dev
then
HB_CONTRIBLIBS="${HB_CONTRIBLIBS} hbpgsql"
export HB_CONTRIBLIBS="${HB_CONTRIBLIBS} hbpgsql"
fi
if test_reqpkg libmysqlclient15-dev
then
HB_CONTRIBLIBS="${HB_CONTRIBLIBS} hbmysql"
export HB_CONTRIBLIBS="${HB_CONTRIBLIBS} hbmysql"
fi
export HB_CONTRIBLIBS
if [ -z "${TOINST_LST}" ] || [ "$1" = "--force" ]
then
. ./bin/pack_src.sh