Re: [RFC] Removing support for GCJ and GCJFLAGS from dpkg? (2/2)
From
Guillem Jover@1:229/2 to
tony mancill on Fri Sep 1 12:00:01 2023
[continued from previous message]
to B<CFLAGS>, B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>,
-B<GCJFLAGS>, B<FFLAGS> and B<FCFLAGS> where B<BUILDPATH> is
+B<FFLAGS> and B<FCFLAGS> where B<BUILDPATH> is
set to the top-level directory of the package being built.
This has the effect of removing the build path from any generated file.
@@ -692,7 +688,7 @@ The ideal fix is to stop capturing build flags.
This setting (since dpkg 1.18.5; enabled by default) adds
B<-fdebug-prefix-map=>I<BUILDPATH>B<=.>
to B<CFLAGS>, B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>,
-B<GCJFLAGS>, B<FFLAGS> and B<FCFLAGS> where B<BUILDPATH> is
+B<FFLAGS> and B<FCFLAGS> where B<BUILDPATH> is
set to the top-level directory of the package being built.
This has the effect of removing the build path from any generated debug
symbols.
diff --git a/scripts/Dpkg/BuildFlags.pm b/scripts/Dpkg/BuildFlags.pm
index 3e7dfdef9..ff5b3eb0e 100644
--- a/scripts/Dpkg/BuildFlags.pm
+++ b/scripts/Dpkg/BuildFlags.pm
@@ -83,7 +83,6 @@ sub _init_vendor_defaults {
CXXFLAGS => '',
OBJCFLAGS => '',
OBJCXXFLAGS => '',
- GCJFLAGS => '',
DFLAGS => '',
FFLAGS => '',
FCFLAGS => '',
@@ -96,7 +95,6 @@ sub _init_vendor_defaults {
CXXFLAGS => 'vendor',
OBJCFLAGS => 'vendor',
OBJCXXFLAGS => 'vendor',
- GCJFLAGS => 'vendor',
DFLAGS => 'vendor',
FFLAGS => 'vendor',
FCFLAGS => 'vendor',
@@ -109,7 +107,6 @@ sub _init_vendor_defaults {
CXXFLAGS => 0,
OBJCFLAGS => 0,
OBJCXXFLAGS => 0,
- GCJFLAGS => 0,
DFLAGS => 0,
FFLAGS => 0,
FCFLAGS => 0,
diff --git a/scripts/Dpkg/BuildInfo.pm b/scripts/Dpkg/BuildInfo.pm
index 475dc4488..761c16658 100644
--- a/scripts/Dpkg/BuildInfo.pm
+++ b/scripts/Dpkg/BuildInfo.pm
@@ -76,7 +76,6 @@ my @env_allowed = (
CXXFLAGS
OBJCFLAGS
OBJCXXFLAGS
- GCJFLAGS
DFLAGS
FFLAGS
LDFLAGS
diff --git a/scripts/