Bug#264413: marked as done (OCamlMakefile: should use the CPPFLAGS variable)
Your message dated Sun, 22 Aug 2004 11:32:11 -0400
with message-id <E1ByuKJ-00086y-00@newraff.debian.org>
and subject line Bug#264413: fixed in ocaml-tools 2004.08.22-1
has caused the attached Bug report to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere. Please contact me immediately.)
Debian bug tracking system administrator
(administrator, Debian Bugs database)
--------------------------------------
Received: (at submit) by bugs.debian.org; 8 Aug 2004 18:53:49 +0000
>From julien.cristau@ens-lyon.fr Sun Aug 08 11:53:49 2004
Return-path: <julien.cristau@ens-lyon.fr>
Received: from kullensrv.kullen.rwth-aachen.de (mail.kullen.rwth-aachen.de) [137.226.77.2]
by spohr.debian.org with esmtp (Exim 3.35 1 (Debian))
id 1Btsnl-0005Eu-00; Sun, 08 Aug 2004 11:53:49 -0700
Received: from localhost (localhost [127.0.0.1])
by mail.kullen.rwth-aachen.de (Postfix) with ESMTP id 288643C015
for <submit@bugs.debian.org>; Sun, 8 Aug 2004 20:53:48 +0200 (CEST)
Received: from mail.kullen.rwth-aachen.de ([127.0.0.1])
by localhost (kullensrv [127.0.0.1]) (amavisd-new, port 10024) with SMTP
id 30366-05 for <submit@bugs.debian.org>;
Sun, 8 Aug 2004 20:53:47 +0200 (CEST)
Received: from bryan (bryan.kullen.RWTH-Aachen.DE [137.226.77.38])
by mail.kullen.rwth-aachen.de (Postfix) with ESMTP id CFA403C012
for <submit@bugs.debian.org>; Sun, 8 Aug 2004 20:53:47 +0200 (CEST)
Received: by bryan (Postfix, from userid 1000)
id 61E4D41124; Sun, 8 Aug 2004 20:52:32 +0200 (CEST)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: Julien Cristau <julien.cristau@ens-lyon.fr>
To: Debian Bug Tracking System <submit@bugs.debian.org>
Subject: OCamlMakefile: should use the CPPFLAGS variable
X-Mailer: reportbug 2.63
Date: Sun, 08 Aug 2004 20:52:32 +0200
Message-Id: <[🔎] 20040808185232.61E4D41124@bryan>
X-Virus-Scanned: by amavisd-new at kullen.rwth-aachen.de
Delivered-To: submit@bugs.debian.org
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2004_03_25
(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Status: No, hits=-6.4 required=4.0 tests=BAYES_00,HAS_PACKAGE,
UPPERCASE_25_50 autolearn=no version=2.60-bugs.debian.org_2004_03_25
X-Spam-Level:
Package: ocaml-tools
Version: 2004.07.26-1
Severity: wishlist
Tags: patch
Hi,
OCamlMakefile uses CFLAGS to give options to the C preprocessor (such
as -DFOO), whereas the variable used in this case is usually CPPFLAGS.
The following patch (against the version of OCamlMakefile included in
ocaml-tools/2004.07.26-1), separates the cc and cpp options in their own
variables. It works for me, but I have not tested all possible uses for
OCamlMakefile, so I could have overlooked something.
Regards,
Julien Cristau
*** OCamlMakefile.diff
--- OCamlMakefile 2004-07-15 17:25:12.000000000 +0200
+++ OCamlMakefile.new 2004-08-08 20:05:00.000000000 +0200
@@ -105,7 +105,7 @@
export MSVC
WIN32 := 1
ifndef STATIC
- CFLAGS_WIN32 := -DCAML_DLL
+ CPPFLAGS_WIN32 := -DCAML_DLL
endif
CFLAGS_WIN32 += -nologo
EXT_OBJ := obj
@@ -150,6 +150,7 @@
export CFLAGS
export CXXFLAGS
export LDFLAGS
+export CPPFLAGS
ifndef RPATH_FLAG
RPATH_FLAG := -R
@@ -157,12 +158,16 @@
export RPATH_FLAG
ifndef MSVC
-ifndef PIC_FLAGS
- PIC_FLAGS := -fPIC -DPIC
+ifndef PIC_CFLAGS
+ PIC_CFLAGS := -fPIC
+endif
+ifndef PIC_CPPFLAGS
+ PIC_CPPFLAGS := -DPIC
endif
endif
-export PIC_FLAGS
+export PIC_CFLAGS
+export PIC_CPPFLAGS
BCRESULT := $(addsuffix $(BCSUFFIX), $(RESULT))
NCRESULT := $(addsuffix $(NCSUFFIX), $(RESULT))
@@ -350,6 +355,7 @@
export C_OXRIDL
export SUBPROJS
export CFLAGS_WIN32
+export CPPFLAGS_WIN32
INCFLAGS :=
SHELL := /bin/sh
@@ -569,7 +575,8 @@
MAKE_DEPS := $(MLDEPS) $(BCDEPIS)
ifdef CREATE_LIB
- CFLAGS := $(PIC_FLAGS) $(CFLAGS)
+ CFLAGS := $(PIC_CFLAGS) $(CFLAGS)
+ CPPFLAGS := $(PIC_CPPFLAGS) $(CPPFLAGS)
ifndef STATIC
ifneq ($(strip $(OBJ_LINK)),)
MAKEDLL := $(DLLSONAME)
@@ -617,7 +624,7 @@
REAL_IMPL_INTF := $(IMPLX_INTF)
IMPL_SUF := .cmx
- CFLAGS := -DNATIVE_CODE $(CFLAGS)
+ CPPFLAGS := -DNATIVE_CODE $(CPPFLAGS)
DEPFLAGS := -native
MAKE_DEPS := $(MLDEPS) $(NCDEPIS)
@@ -629,7 +636,8 @@
ifndef CREATE_LIB
ALL_LDFLAGS += $(LIBS:%=%.cmxa)
else
- CFLAGS := $(PIC_FLAGS) $(CFLAGS)
+ CFLAGS := $(PIC_CFLAGS) $(CFLAGS)
+ CPPFLAGS := $(PIC_CPPFLAGS) $(CPPFLAGS)
endif
ifdef THREADS
@@ -983,10 +991,12 @@
.c.$(EXT_OBJ):
$(OCAMLC) -c -cc "$(CC)" -ccopt "$(CFLAGS) \
+ $(CPPFLAGS) $(CPPFLAGS_WIN32) \
$(CFLAGS_WIN32) $(CINCFLAGS) $(CFLAG_O)$@ " $<
.$(EXT_CXX).$(EXT_OBJ):
- $(CXX) -c $(CXXFLAGS) $(CINCFLAGS) -I'$(OCAMLLIBPATH)' \
+ $(CXX) -c $(CXXFLAGS) $(CINCFLAGS) $(CPPFLAGS) \
+ -I'$(OCAMLLIBPATH)' \
$< $(CFLAG_O)$@
$(MLDEPDIR)/%.d: %.ml
-- System Information:
Debian Release: 3.1
APT prefers testing
APT policy: (990, 'testing'), (500, 'unstable')
Architecture: i386 (i686)
Kernel: Linux 2.6.7
Locale: LANG=C, LC_CTYPE=C
---------------------------------------
Received: (at 264413-close) by bugs.debian.org; 22 Aug 2004 15:38:31 +0000
>From katie@ftp-master.debian.org Sun Aug 22 08:38:31 2004
Return-path: <katie@ftp-master.debian.org>
Received: from newraff.debian.org [208.185.25.31] (mail)
by spohr.debian.org with esmtp (Exim 3.35 1 (Debian))
id 1ByuQR-0004js-00; Sun, 22 Aug 2004 08:38:31 -0700
Received: from katie by newraff.debian.org with local (Exim 3.35 1 (Debian))
id 1ByuKJ-00086y-00; Sun, 22 Aug 2004 11:32:11 -0400
From: Ralf Treinen <treinen@debian.org>
To: 264413-close@bugs.debian.org
X-Katie: $Revision: 1.51 $
Subject: Bug#264413: fixed in ocaml-tools 2004.08.22-1
Message-Id: <E1ByuKJ-00086y-00@newraff.debian.org>
Sender: Archive Administrator <katie@ftp-master.debian.org>
Date: Sun, 22 Aug 2004 11:32:11 -0400
Delivered-To: 264413-close@bugs.debian.org
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2004_03_25
(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Status: No, hits=-6.0 required=4.0 tests=BAYES_00,HAS_BUG_NUMBER
autolearn=no version=2.60-bugs.debian.org_2004_03_25
X-Spam-Level:
Source: ocaml-tools
Source-Version: 2004.08.22-1
We believe that the bug you reported is fixed in the latest version of
ocaml-tools, which is due to be installed in the Debian FTP archive:
ocaml-tools_2004.08.22-1.diff.gz
to pool/main/o/ocaml-tools/ocaml-tools_2004.08.22-1.diff.gz
ocaml-tools_2004.08.22-1.dsc
to pool/main/o/ocaml-tools/ocaml-tools_2004.08.22-1.dsc
ocaml-tools_2004.08.22-1_all.deb
to pool/main/o/ocaml-tools/ocaml-tools_2004.08.22-1_all.deb
ocaml-tools_2004.08.22.orig.tar.gz
to pool/main/o/ocaml-tools/ocaml-tools_2004.08.22.orig.tar.gz
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 264413@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Ralf Treinen <treinen@debian.org> (supplier of updated ocaml-tools package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.7
Date: Sun, 22 Aug 2004 17:07:20 +0200
Source: ocaml-tools
Binary: ocaml-tools
Architecture: source all
Version: 2004.08.22-1
Distribution: unstable
Urgency: low
Maintainer: Debian OCaml Maintainers <debian-ocaml-maint@lists.debian.org>
Changed-By: Ralf Treinen <treinen@debian.org>
Description:
ocaml-tools - Various tools for ocaml programmers
Closes: 264413
Changes:
ocaml-tools (2004.08.22-1) unstable; urgency=low
.
* New upstream version 6.18.0 of OcamlMakefile. This upstream release
fixes a bug concerning the use of the CPPFLAGS variable. Thanks to
Julien Cristau for the patch! (closes: #264413)
* Install gtk example.
* Removed useless patch 02_ocamlmake-incpath
Files:
8417e8732b1dba47568ee11d1eeb8259 834 devel optional ocaml-tools_2004.08.22-1.dsc
8135f3420fa9eadf3700332744d788a6 42012 devel optional ocaml-tools_2004.08.22.orig.tar.gz
4b7590b03be06a3783d58664a5902223 4545 devel optional ocaml-tools_2004.08.22-1.diff.gz
04cf772e7256342a55643ef2d0edec91 57658 devel optional ocaml-tools_2004.08.22-1_all.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.5 (GNU/Linux)
iD8DBQFBKLfttzWmSeC6BMERAtxEAJ9aSBnfz6bJbRo6ouB/2ByoYMRVEQCgqzQe
3YzioZTf/t5lXJiyJyv6kxs=
=Z6CU
-----END PGP SIGNATURE-----
Reply to: