diff options
| author | Julian Andres Klode <jak@debian.org> | 2015-11-28 22:27:15 +0100 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2015-11-28 22:27:15 +0100 |
| commit | 7ac9386cb6e272625490fcf3e8183b45e28bbc43 (patch) | |
| tree | 814a53fd0787a95401db39c9fd9c2ef68881502b | |
| parent | 25ff0797da5bc59ad4c322c7f1ea25664be8a461 (diff) | |
Revert "appease adequate with some weak symbols for -private"
This reverts commit 28f24d3dad1844af316337d565ba2ebc11c8ce97.
This fails on Ubuntu as they build with -Bsymbolic-functions.
| -rw-r--r-- | apt-pkg/contrib/macros.h | 2 | ||||
| -rw-r--r-- | apt-private/private-cmndline.cc | 4 | ||||
| -rw-r--r-- | apt-private/private-cmndline.h | 4 |
3 files changed, 2 insertions, 8 deletions
diff --git a/apt-pkg/contrib/macros.h b/apt-pkg/contrib/macros.h index 2727fd81f..68406f4d8 100644 --- a/apt-pkg/contrib/macros.h +++ b/apt-pkg/contrib/macros.h @@ -77,7 +77,6 @@ #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 @@ -85,7 +84,6 @@ #define APT_PURE #define APT_NORETURN #define APT_PRINTF(n) - #define APT_WEAK #endif #if APT_GCC_VERSION > 0x0302 diff --git a/apt-private/private-cmndline.cc b/apt-private/private-cmndline.cc index 9c5eae470..4231c4f0e 100644 --- a/apt-private/private-cmndline.cc +++ b/apt-private/private-cmndline.cc @@ -514,7 +514,3 @@ unsigned short DispatchCommandLine(CommandLine &CmdL, std::vector<CommandLine::D 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 4819adce1..819eb77cc 100644 --- a/apt-private/private-cmndline.h +++ b/apt-private/private-cmndline.h @@ -23,14 +23,14 @@ enum class APT_CMD { APT_SORTPKG, }; -APT_PUBLIC bool ShowHelp(CommandLine &CmdL) APT_WEAK; +bool ShowHelp(CommandLine &CmdL); struct aptDispatchWithHelp { const char *Match; bool (*Handler)(CommandLine &); const char *Help; }; -APT_PUBLIC std::vector<aptDispatchWithHelp> GetCommands() APT_WEAK; +std::vector<aptDispatchWithHelp> GetCommands(); 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[]); |