Revert "Revert "appease adequate with some weak symbols for -private""

This reverts commit 7ac9386cb6e272625490fcf3e8183b45e28bbc43.

diff --git a/apt-pkg/contrib/macros.h b/apt-pkg/contrib/macros.h
index 68406f4d8e19a4774b46610cac1056cff8e179ac..2727fd81fb668f371831e4df56e819b6a498c198 100644 (file)
--- a/apt-pkg/contrib/macros.h
+++ b/apt-pkg/contrib/macros.h
@@ -77,6 +77,7 @@
        #define APT_PURE        __attribute__((pure))
        #define APT_NORETURN    __attribute__((noreturn))
        #define APT_PRINTF(n)   __attribute__((format(printf, n, n + 1)))
        #define APT_PURE        __attribute__((pure))
        #define APT_NORETURN    __attribute__((noreturn))
        #define APT_PRINTF(n)   __attribute__((format(printf, n, n + 1)))

+       #define APT_WEAK        __attribute__((weak));

 #else
        #define APT_DEPRECATED
        #define APT_DEPRECATED_MSG
 #else
        #define APT_DEPRECATED
        #define APT_DEPRECATED_MSG


@@ -84,6 +85,7 @@
        #define APT_PURE
        #define APT_NORETURN
        #define APT_PRINTF(n)
        #define APT_PURE
        #define APT_NORETURN
        #define APT_PRINTF(n)

+       #define APT_WEAK

 #endif
 
 #if APT_GCC_VERSION > 0x0302
 #endif
 
 #if APT_GCC_VERSION > 0x0302

diff --git a/apt-private/private-cmndline.cc b/apt-private/private-cmndline.cc
index 4231c4f0ef82088ca2513ebf43d7bb3ca00d6c35..9c5eae470c1da3df45e50f6e389edd2c6486d390 100644 (file)
--- a/apt-private/private-cmndline.cc
+++ b/apt-private/private-cmndline.cc
@@ -514,3 +514,7 @@ unsigned short DispatchCommandLine(CommandLine &CmdL, std::vector<CommandLine::D
    return Errors == true ? 100 : 0;
 }
                                                                        /*}}}*/
    return Errors == true ? 100 : 0;
 }
                                                                        /*}}}*/

+
+// weak symbols
+bool ShowHelp(CommandLine &) { return false; }
+std::vector<aptDispatchWithHelp> GetCommands() { return {}; }

diff --git a/apt-private/private-cmndline.h b/apt-private/private-cmndline.h
index 819eb77cc6907fa7931ce7ad7b1c2cd05ad44e69..4819adce138c05cbd1780c1d140aac5872b33daa 100644 (file)
--- a/apt-private/private-cmndline.h
+++ b/apt-private/private-cmndline.h
@@ -23,14 +23,14 @@ enum class APT_CMD {
    APT_SORTPKG,
 };
 
    APT_SORTPKG,
 };
 

-bool ShowHelp(CommandLine &CmdL);
+APT_PUBLIC bool ShowHelp(CommandLine &CmdL) APT_WEAK;

 struct aptDispatchWithHelp
 {
    const char *Match;
    bool (*Handler)(CommandLine &);
    const char *Help;
 };
 struct aptDispatchWithHelp
 {
    const char *Match;
    bool (*Handler)(CommandLine &);
    const char *Help;
 };

-std::vector<aptDispatchWithHelp> GetCommands();
+APT_PUBLIC std::vector<aptDispatchWithHelp> GetCommands() APT_WEAK;

 
 APT_PUBLIC std::vector<CommandLine::Dispatch> ParseCommandLine(CommandLine &CmdL, APT_CMD const Binary,
       Configuration * const * const Cnf, pkgSystem ** const Sys, int const argc, const char * argv[]);
 
 APT_PUBLIC std::vector<CommandLine::Dispatch> ParseCommandLine(CommandLine &CmdL, APT_CMD const Binary,
       Configuration * const * const Cnf, pkgSystem ** const Sys, int const argc, const char * argv[]);