[SCM] FreeCAD packaging branch, master, updated. debian/0.11.3729.dfsg-1-19-ga14e0d5

[Anton Gladky]

Hi, Bernhard!

I just want to simplify debian/rules, because it looks now overloaded
and difficult to maintain.
I think it is better to use default options for building, if it is
possible (CFLAGS in this case), no needs to change them.

If somebody needs unoptimized version (and he knows, what it is), he
is definitely able to compile it from the source with required
options.

If you have another opinion, please, share it. I am ready to revert
those changes, if needed.

Anton




On Wed, Jun 8, 2011 at 10:05 AM, Bernhard R. Link <brlink at debian.org> wrote:
> * Anton Gladky <gladky.anton at gmail.com> [110607 22:07]:
>> The following commit has been merged in the master branch:
>> commit a14e0d52d19716229e36d1c706c8f83d002b030f
>> Author: Anton Gladky <gladky.anton at gmail.com>
>> Date:   Tue Jun 7 22:06:00 2011 +0200
>>
>>     Update debian/rules.
>>
>> diff --git a/debian/rules b/debian/rules
>> index 1804c6c..607341e 100755
>> --- a/debian/rules
>> +++ b/debian/rules
>> @@ -11,26 +11,6 @@ MODULES = Part Mesh MeshPart PartDesign Sketcher Points Raytracing Image Drawing
>>  DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
>>  DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
>>
>> -CFLAGS = -Wall -g
>> -
>> -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
>> -     CFLAGS += -O0
>> -else
>> -     CFLAGS += -O2
>> -endif
>> -
> [...]
>>
>>  config.status: configure
>>       dh_testdir
>> @@ -39,9 +19,7 @@ config.status: configure
>>  --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
>>  --prefix=/usr/lib/freecad --mandir=/usr/share/man \
>>  --infodir=/usr/share/info --datadir=/usr/share/freecad \
>> ---includedir=/usr/include/freecad --docdir=/usr/share/doc/freecad \
>> -CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
>> -     touch src/Build/Version.h
>> +--includedir=/usr/include/freecad --docdir=/usr/share/doc/freecad
>
> Is there a reason you drop DEB_BUILD_OPTIONS support and expose
> configure to random CFLAGS from the users' environment?
>
> Just asking,
>        Bernhard R. Link
>