Am Sonntag, den 19.08.2007, 12:33 -0500 schrieb Ming Hua:

> Gabedit doesn't support DEB_BUILD_OPTIONS=noopt because the optimization
> option "-O2" is hardcoded in source:
> 
> ./src/NetWork/Makefile:CFLAGS =  -Wall -O2 $(GTKCFLAGS)
[snip]
> I understand to support this build option, patching the upstream source
> is needed, and is not easy.  I'm just filing this wishlist bug and hope
> somebody would be interested in fixing it.

I sent a patch to upstream to allow customization of these flags. If you
want to test it, just apply the attached debdiff.

Regards, Daniel
diff -u gabedit-2.0.11/debian/patches/00list gabedit-2.0.11/debian/patches/00list
--- gabedit-2.0.11/debian/patches/00list
+++ gabedit-2.0.11/debian/patches/00list
@@ -1,0 +2 @@
+noopt
diff -u gabedit-2.0.11/debian/changelog gabedit-2.0.11/debian/changelog
--- gabedit-2.0.11/debian/changelog
+++ gabedit-2.0.11/debian/changelog
@@ -1,3 +1,13 @@
+gabedit (2.0.11-2) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+
+  * debian/rules (build-stamp): Respect setting noopt.
+  * debian/patches/noopt.dpatch: Do not hardcode the -O2 flag in upstreams
+    Makefiles.
+
+ -- Daniel Leidert (dale) <[EMAIL PROTECTED]>  Sun, 19 Aug 2007 20:18:46 +0200
+
 gabedit (2.0.11-1) unstable; urgency=low
 
   * New upstream release 2.0.11.
diff -u gabedit-2.0.11/debian/rules gabedit-2.0.11/debian/rules
--- gabedit-2.0.11/debian/rules
+++ gabedit-2.0.11/debian/rules
@@ -11,12 +11,20 @@
 
 include /usr/share/dpatch/dpatch.make
 
+COMMONCFLAGS = -Wall
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+COMMONCFLAGS += -O0
+else
+COMMONCFLAGS += -O2
+endif
+
 
 build: patch-stamp build-stamp
 
 build-stamp: debian/gabedit.1
 	dh_testdir
-	$(MAKE)
+	$(MAKE) COMMONCFLAGS="$(COMMONCFLAGS)"
 	touch build-stamp
 
 debian/gabedit.1: debian/gabedit.1.xml
only in patch2:
unchanged:
--- gabedit-2.0.11.orig/debian/patches/noopt.dpatch
+++ gabedit-2.0.11/debian/patches/noopt.dpatch
@@ -0,0 +1,219 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## noopt.dpatch by Daniel Leidert (dale) <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
[EMAIL PROTECTED]@
+diff -urNad gabedit-2.0.11~/CONFIG gabedit-2.0.11/CONFIG
+--- gabedit-2.0.11~/CONFIG	2007-08-19 20:03:20.000000000 +0200
++++ gabedit-2.0.11/CONFIG	2007-08-19 20:03:20.000000000 +0200
+@@ -11,3 +11,4 @@
+ WIN32LIB       = 
+ CC             = gcc -g
+ 
++COMMONCFLAGS    = -Wall -O2
+diff -urNad gabedit-2.0.11~/gtkglarea/Makefile gabedit-2.0.11/gtkglarea/Makefile
+--- gabedit-2.0.11~/gtkglarea/Makefile	2007-08-19 20:03:13.000000000 +0200
++++ gabedit-2.0.11/gtkglarea/Makefile	2007-08-19 20:03:20.000000000 +0200
+@@ -4,7 +4,7 @@
+ 
+ all: compiling
+ 
+-CFLAGS =  -Wall -O2 $(GTKCFLAGS) $(OGLCFLAGS) 
++CFLAGS =  $(COMMONCFLAGS) $(GTKCFLAGS) $(OGLCFLAGS) 
+ 
+ %.o : %.c
+ 	$(CC) -c $(CFLAGS) $< -o $@
+diff -urNad gabedit-2.0.11~/src/Common/Makefile gabedit-2.0.11/src/Common/Makefile
+--- gabedit-2.0.11~/src/Common/Makefile	2007-08-19 20:03:13.000000000 +0200
++++ gabedit-2.0.11/src/Common/Makefile	2007-08-19 20:03:20.000000000 +0200
+@@ -1,7 +1,7 @@
+ OBJECTS = Gabedit.o Help.o Install.o Preferences.o Printer.o Run.o SplashScreen.o TextEdit.o Windows.o Status.o Exit.o MenuToolBar.o StockIcons.o
+ 
+ include ../../CONFIG
+-CFLAGS =  -Wall -O2 $(GTKCFLAGS)
++CFLAGS =  $(COMMONCFLAGS) $(GTKCFLAGS)
+ 
+ all: compiling 
+ 
+diff -urNad gabedit-2.0.11~/src/Files/Makefile gabedit-2.0.11/src/Files/Makefile
+--- gabedit-2.0.11~/src/Files/Makefile	2007-08-19 20:03:13.000000000 +0200
++++ gabedit-2.0.11/src/Files/Makefile	2007-08-19 20:03:20.000000000 +0200
+@@ -1,7 +1,7 @@
+ OBJECTS = FileChooser.o FolderChooser.o ListeFiles.o GabeditFolderChooser.o GabeditFileChooser.o
+ 
+ include ../../CONFIG
+-CFLAGS =  -Wall -O2 $(GTKCFLAGS)
++CFLAGS =  $(COMMONCFLAGS) $(GTKCFLAGS)
+ 
+ all: compiling 
+ 
+diff -urNad gabedit-2.0.11~/src/Gamess/Makefile gabedit-2.0.11/src/Gamess/Makefile
+--- gabedit-2.0.11~/src/Gamess/Makefile	2007-08-19 20:03:13.000000000 +0200
++++ gabedit-2.0.11/src/Gamess/Makefile	2007-08-19 20:03:20.000000000 +0200
+@@ -1,7 +1,7 @@
+ OBJECTS = Gamess.o GamessMolecule.o GamessControl.o GamessBasis.o GamessGuess.o GamessSCF.o
+ 
+ include ../../CONFIG
+-CFLAGS =  -Wall -O2 $(GTKCFLAGS)
++CFLAGS =  $(COMMONCFLAGS) $(GTKCFLAGS)
+ 
+ all: compiling 
+ 
+diff -urNad gabedit-2.0.11~/src/Gaussian/Makefile gabedit-2.0.11/src/Gaussian/Makefile
+--- gabedit-2.0.11~/src/Gaussian/Makefile	2007-08-19 20:03:13.000000000 +0200
++++ gabedit-2.0.11/src/Gaussian/Makefile	2007-08-19 20:03:20.000000000 +0200
+@@ -1,7 +1,7 @@
+ OBJECTS = GInterfaceBasis.o GInterfaceGeom.o GInterfaceLink.o GInterfaceMethodeBase.o GInterfaceRoute.o Gaussian.o
+ 
+ include ../../CONFIG
+-CFLAGS =  -Wall -O2 $(GTKCFLAGS)
++CFLAGS =  $(COMMONCFLAGS) $(GTKCFLAGS)
+ 
+ all: compiling 
+ 
+diff -urNad gabedit-2.0.11~/src/Geometry/Makefile gabedit-2.0.11/src/Geometry/Makefile
+--- gabedit-2.0.11~/src/Geometry/Makefile	2007-08-19 20:03:13.000000000 +0200
++++ gabedit-2.0.11/src/Geometry/Makefile	2007-08-19 20:03:20.000000000 +0200
+@@ -1,7 +1,7 @@
+ OBJECTS = DrawGeom.o EnergiesCurves.o Fragments.o GeomConversion.o GeomXYZ.o GeomZmatrix.o ImagesGeom.o InterfaceGeom.o Mesure.o Postscript.o Povray.o ResultsAnalise.o Symmetry.o RotFragments.o BuildLinear.o BuildRing.o BuildRoZPhi.o BuildPolyPeptide.o FragmentsPPD.o FragmentsPSC.o FragmentsPNA.o BuildPolySaccharide.o BuildPolyNucleicAcid.o BuildNanoTube.o PersonalFragments.o SavePersonalFragments.o LoadPersonalFragments.o OpenBabel.o MenuToolBarGeom.o
+ 
+ include ../../CONFIG
+-CFLAGS =  -Wall -O2 $(GTKCFLAGS)
++CFLAGS =  $(COMMONCFLAGS) $(GTKCFLAGS)
+ 
+ all: compiling 
+ 
+diff -urNad gabedit-2.0.11~/src/MPQC/Makefile gabedit-2.0.11/src/MPQC/Makefile
+--- gabedit-2.0.11~/src/MPQC/Makefile	2007-08-19 20:03:13.000000000 +0200
++++ gabedit-2.0.11/src/MPQC/Makefile	2007-08-19 20:03:20.000000000 +0200
+@@ -1,7 +1,7 @@
+ OBJECTS = MPQC.o MPQCMolecule.o MPQCMole.o MPQCGuessWaveFunction.o MPQCMpqc.o MPQCBasis.o MPQCLib.o MPQCBasisLibrary.o MPQCFunctionals.o MPQCOptimisation.o MPQCProperties.o
+ 
+ include ../../CONFIG
+-CFLAGS =  -Wall -O2 $(GTKCFLAGS)
++CFLAGS =  $(COMMONCFLAGS) $(GTKCFLAGS)
+ 
+ all: compiling 
+ 
+diff -urNad gabedit-2.0.11~/src/Molcas/Makefile gabedit-2.0.11/src/Molcas/Makefile
+--- gabedit-2.0.11~/src/Molcas/Makefile	2007-08-19 20:03:13.000000000 +0200
++++ gabedit-2.0.11/src/Molcas/Makefile	2007-08-19 20:03:20.000000000 +0200
+@@ -1,7 +1,7 @@
+ OBJECTS = Molcas.o MolcasSeward.o MolcasScf.o MolcasGridIT.o MolcasOptimisation.o MolcasVariables.o MolcasLib.o MolcasBasisLibrary.o MolcasBasis.o
+ 
+ include ../../CONFIG
+-CFLAGS =  -Wall -O2 $(GTKCFLAGS)
++CFLAGS =  $(COMMONCFLAGS) $(GTKCFLAGS)
+ 
+ all: compiling 
+ 
+diff -urNad gabedit-2.0.11~/src/MolecularMechanics/Makefile gabedit-2.0.11/src/MolecularMechanics/Makefile
+--- gabedit-2.0.11~/src/MolecularMechanics/Makefile	2007-08-19 20:03:13.000000000 +0200
++++ gabedit-2.0.11/src/MolecularMechanics/Makefile	2007-08-19 20:03:20.000000000 +0200
+@@ -1,7 +1,7 @@
+ OBJECTS = Atom.o Molecule.o ForceField.o MolecularMechanics.o ConjugateGradient.o SteepestDescent.o QuasiNewton.o MolecularMechanicsDlg.o CreateMolecularMechanicsFile.o CreatePersonalMMFile.o LoadMMParameters.o SetMMParameters.o CreateDefaultPDBTpl.o LoadPDBTemplate.o PDBTemplate.o SetPDBTemplate.o SavePDBTemplate.o CalculTypesAmber.o
+ 
+ include ../../CONFIG
+-CFLAGS =  -Wall -O2 $(GTKCFLAGS)
++CFLAGS =  $(COMMONCFLAGS) $(GTKCFLAGS)
+ 
+ all: compiling 
+ 
+diff -urNad gabedit-2.0.11~/src/Molpro/Makefile gabedit-2.0.11/src/Molpro/Makefile
+--- gabedit-2.0.11~/src/Molpro/Makefile	2007-08-19 20:03:13.000000000 +0200
++++ gabedit-2.0.11/src/Molpro/Makefile	2007-08-19 20:03:20.000000000 +0200
+@@ -1,7 +1,7 @@
+ OBJECTS = MolproLib.o MInterfaceBasis.o MInterfaceComm.o MInterfaceGene.o MInterfaceGeom.o Molpro.o MolproBasisLibrary.o
+ 
+ include ../../CONFIG
+-CFLAGS =  -Wall -O2 $(GTKCFLAGS)
++CFLAGS =  $(COMMONCFLAGS) $(GTKCFLAGS)
+ 
+ all: compiling 
+ 
+diff -urNad gabedit-2.0.11~/src/NetWork/Makefile gabedit-2.0.11/src/NetWork/Makefile
+--- gabedit-2.0.11~/src/NetWork/Makefile	2007-08-19 20:03:13.000000000 +0200
++++ gabedit-2.0.11/src/NetWork/Makefile	2007-08-19 20:03:20.000000000 +0200
+@@ -1,7 +1,7 @@
+ OBJECTS = Ftp.o Process.o Rsh.o Ssh.o Scp.o FilesTransfer.o RemoteCommand.o Batch.o
+ 
+ include ../../CONFIG
+-CFLAGS =  -Wall -O2 $(GTKCFLAGS)
++CFLAGS =  $(COMMONCFLAGS) $(GTKCFLAGS)
+ 
+ all: compiling 
+ 
+diff -urNad gabedit-2.0.11~/src/OpenGL/Makefile gabedit-2.0.11/src/OpenGL/Makefile
+--- gabedit-2.0.11~/src/OpenGL/Makefile	2007-08-19 20:03:13.000000000 +0200
++++ gabedit-2.0.11/src/OpenGL/Makefile	2007-08-19 20:03:20.000000000 +0200
+@@ -2,7 +2,7 @@
+ 
+ include ../../CONFIG
+ 
+-CFLAGS =  -Wall -O2 $(GTKCFLAGS) $(OGLCFLAGS)
++CFLAGS =  $(COMMONCFLAGS) $(GTKCFLAGS) $(OGLCFLAGS)
+ 
+ all: compiling
+ 
+diff -urNad gabedit-2.0.11~/src/PCGamess/Makefile gabedit-2.0.11/src/PCGamess/Makefile
+--- gabedit-2.0.11~/src/PCGamess/Makefile	2007-08-19 20:03:13.000000000 +0200
++++ gabedit-2.0.11/src/PCGamess/Makefile	2007-08-19 20:03:20.000000000 +0200
+@@ -1,7 +1,7 @@
+ OBJECTS = PCGamess.o PCGamessMolecule.o PCGamessControl.o PCGamessBasis.o PCGamessGuess.o PCGamessSCF.o
+ 
+ include ../../CONFIG
+-CFLAGS =  -Wall -O2 $(GTKCFLAGS)
++CFLAGS =  $(COMMONCFLAGS) $(GTKCFLAGS)
+ 
+ all: compiling 
+ 
+diff -urNad gabedit-2.0.11~/src/QChem/Makefile gabedit-2.0.11/src/QChem/Makefile
+--- gabedit-2.0.11~/src/QChem/Makefile	2007-08-19 20:03:13.000000000 +0200
++++ gabedit-2.0.11/src/QChem/Makefile	2007-08-19 20:03:20.000000000 +0200
+@@ -1,7 +1,7 @@
+ OBJECTS = QChem.o QChemMolecule.o QChemRem.o QChemGuess.o QChemBasis.o QChemLib.o
+ 
+ include ../../CONFIG
+-CFLAGS =  -Wall -O2 $(GTKCFLAGS)
++CFLAGS =  $(COMMONCFLAGS) $(GTKCFLAGS)
+ 
+ all: compiling 
+ 
+diff -urNad gabedit-2.0.11~/src/Spectrum/Makefile gabedit-2.0.11/src/Spectrum/Makefile
+--- gabedit-2.0.11~/src/Spectrum/Makefile	2007-08-19 20:03:13.000000000 +0200
++++ gabedit-2.0.11/src/Spectrum/Makefile	2007-08-19 20:03:20.000000000 +0200
+@@ -1,7 +1,7 @@
+ OBJECTS = SpectrumWin.o IRSpectrum.o RamanSpectrum.o UVSpectrum.o
+ 
+ include ../../CONFIG
+-CFLAGS =  -Wall -O2 $(GTKCFLAGS)
++CFLAGS =  $(COMMONCFLAGS) $(GTKCFLAGS)
+ 
+ all: compiling 
+ 
+diff -urNad gabedit-2.0.11~/src/Symmetry/Makefile gabedit-2.0.11/src/Symmetry/Makefile
+--- gabedit-2.0.11~/src/Symmetry/Makefile	2007-08-19 20:03:13.000000000 +0200
++++ gabedit-2.0.11/src/Symmetry/Makefile	2007-08-19 20:03:20.000000000 +0200
+@@ -1,7 +1,7 @@
+ OBJECTS = MoleculeSymmetry.o MoleculeSymmetryInterface.o PolyHedralOperators.o ReducePolyHedralMolecule.o PrincipalAxis.o ReduceMolecule.o SymmetryOperators.o GenerateMolecule.o
+ 
+ include ../../CONFIG
+-CFLAGS =  -Wall -O2 $(GTKCFLAGS)
++CFLAGS =  $(COMMONCFLAGS) $(GTKCFLAGS)
+ 
+ all: compiling 
+ 
+diff -urNad gabedit-2.0.11~/src/Utils/Makefile gabedit-2.0.11/src/Utils/Makefile
+--- gabedit-2.0.11~/src/Utils/Makefile	2007-08-19 20:03:13.000000000 +0200
++++ gabedit-2.0.11/src/Utils/Makefile	2007-08-19 20:03:20.000000000 +0200
+@@ -1,7 +1,7 @@
+ OBJECTS = GabeditTextEdit.o AtomsProp.o Jacobi.o Transformation.o Utils.o UtilsInterface.o Vector3d.o Matrix3D.o HydrogenBond.o PovrayUtils.o UtilsGL.o ConvUtils.o GabeditXYPlot.o
+ 
+ include ../../CONFIG
+-CFLAGS =  -Wall -O2 $(GTKCFLAGS) $(OGLCFLAGS)
++CFLAGS =  $(COMMONCFLAGS) $(GTKCFLAGS) $(OGLCFLAGS)
+ 
+ all: compiling 
+ 

Reply via email to