Home Explore contacts
Sign In
LDA010
/
bug_ebuild
Watch 0
Star 0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Tree: f08ac02a39
Branches Tags
bug_ebuild
/
gentoo
/
sci-geosciences
/
gpsd
/
files
/
gpsd-3.15-dynamic-libs.patch

gpsd-3.15-dynamic-libs.patch 4.0 KB
History Raw

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101 
  1. From ac48583654e97ef04e8cbb52c2ae77a617c7add3 Mon Sep 17 00:00:00 2001
    2. 

  2. From: Mike Frysinger <vapier@gentoo.org>
    3. 

  3. Date: Sun, 7 Jun 2015 01:08:39 -0400
    4. 

  4. Subject: [PATCH] reenable dynamic libs
    5. 

  5. 

  6. Upstream decided to staticly link their own programs against their libs
    7. 

  7. instead of using the shared ones.  Restore dynamic linking to save space
    8. 

  8. and such.
    9. 

  9. ---
    10. 

  10.  SConstruct | 64 ++++++++++++++++++++++++++++++++++----------------------------
    11. 

  11.  1 file changed, 35 insertions(+), 29 deletions(-)
    12. 

  12. 

  13. diff --git a/SConstruct b/SConstruct
    14. 

  14. index 28cebf0..a050f38 100644
    15. 

  15. --- a/SConstruct
    16. 

  16. +++ b/SConstruct
    17. 

  17. @@ -961,6 +961,9 @@ if qt_env:
    18. 

  18.  gpsflags = ["-lm"] + rtlibs + dbusflags
    19. 

  19.  gpsdflags = usbflags + bluezflags + gpsflags
    20. 

  20.  
    21. 

  21. +gpslibs = ["-lgps"] + gpsflags
    22. 

  22. +gpsdlibs = ["-lgpsd"] + gpsdflags + gpslibs
    23. 

  23. +
    24. 

  24.  # Source groups
    25. 

  25.  
    26. 

  26.  gpsd_sources = ['gpsd.c','timehint.c', 'shmexport.c','dbusexport.c']
    27. 

  27. @@ -983,38 +986,41 @@ gpsmon_sources = [
    28. 

  28.  ## Production programs
    29. 

  29.  
    30. 

  30.  gpsd = env.Program('gpsd', gpsd_sources,
    31. 

  31. -                   LIBS=['gpsd', 'gps_static'], LIBPATH='.',
    32. 

  32. -                   parse_flags=gpsdflags+gpsflags)
    33. 

  33. +                   LIBS=['gpsd'], parse_flags=gpsdflags+gpslibs)
    34. 

  34. +env.Depends(gpsd, [compiled_gpslib])
    35. 

  35. +
    36. 

  36.  gpsdecode = env.Program('gpsdecode', ['gpsdecode.c'],
    37. 

  37. -                        LIBS=['gpsd', 'gps_static'], LIBPATH='.',
    38. 

  38. -                        parse_flags=gpsdflags+gpsflags)
    39. 

  39. +                        LIBS=['gpsd'], parse_flags=gpsdflags+gpslibs)
    40. 

  40. +env.Depends(gpsdecode, [compiled_gpslib])
    41. 

  41. +
    42. 

  42.  gpsctl = env.Program('gpsctl', ['gpsctl.c'],
    43. 

  43. -                     LIBS=['gpsd', 'gps_static'], LIBPATH='.',
    44. 

  44. -                     parse_flags=gpsdflags+gpsflags)
    45. 

  45. +                     LIBS=['gpsd'], parse_flags=gpsdflags+gpslibs)
    46. 

  46. +env.Depends(gpsctl, [compiled_gpslib])
    47. 

  47. +
    48. 

  48.  gpsmon = env.Program('gpsmon', gpsmon_sources,
    49. 

  49. -                     LIBS=['gpsd', 'gps_static'], LIBPATH='.',
    50. 

  50. -                     parse_flags=gpsdflags + gpsflags + ncurseslibs)
    51. 

  51. -gpsdctl = env.Program('gpsdctl', ['gpsdctl.c'],
    52. 

  52. -                      LIBS=['gps_static'], LIBPATH='.',
    53. 

  53. -                      parse_flags=gpsflags)
    54. 

  54. -gpspipe = env.Program('gpspipe', ['gpspipe.c'],
    55. 

  55. -                      LIBS=['gps_static'], LIBPATH='.',
    56. 

  56. -                      parse_flags=gpsflags)
    57. 

  57. -gps2udp = env.Program('gps2udp', ['gps2udp.c'],
    58. 

  58. -                      LIBS=['gps_static'], LIBPATH='.',
    59. 

  59. -                      parse_flags=gpsflags)
    60. 

  60. -gpxlogger = env.Program('gpxlogger', ['gpxlogger.c'],
    61. 

  61. -                        LIBS=['gps_static'], LIBPATH='.',
    62. 

  62. -                        parse_flags=gpsflags)
    63. 

  63. -lcdgps = env.Program('lcdgps', ['lcdgps.c'],
    64. 

  64. -                     LIBS=['gps_static'], LIBPATH='.',
    65. 

  65. -                     parse_flags=gpsflags)
    66. 

  66. -cgps = env.Program('cgps', ['cgps.c'],
    67. 

  67. -                   LIBS=['gps_static'], LIBPATH='.',
    68. 

  68. -                   parse_flags=gpsflags + ncurseslibs)
    69. 

  69. -ntpshmmon = env.Program('ntpshmmon', ['ntpshmmon.c'],
    70. 

  70. -                        LIBS=['gps_static'], LIBPATH='.',
    71. 

  71. -                        parse_flags=gpsflags)
    72. 

  72. +                     LIBS=['gpsd'], parse_flags=gpsdflags+gpslibs + ncurseslibs)
    73. 

  73. +env.Depends(gpsmon, [compiled_gpslib])
    74. 

  74. +
    75. 

  75. +gpsdctl = env.Program('gpsdctl', ['gpsdctl.c'], parse_flags=gpslibs)
    76. 

  76. +env.Depends(gpsdctl, compiled_gpslib)
    77. 

  77. +
    78. 

  78. +gpspipe = env.Program('gpspipe', ['gpspipe.c'], parse_flags=gpslibs)
    79. 

  79. +env.Depends(gpspipe, compiled_gpslib)
    80. 

  80. +
    81. 

  81. +gps2udp = env.Program('gps2udp', ['gps2udp.c'], parse_flags=gpslibs)
    82. 

  82. +env.Depends(gps2udp, compiled_gpslib)
    83. 

  83. +
    84. 

  84. +gpxlogger = env.Program('gpxlogger', ['gpxlogger.c'], parse_flags=gpslibs)
    85. 

  85. +env.Depends(gpxlogger, compiled_gpslib)
    86. 

  86. +
    87. 

  87. +lcdgps = env.Program('lcdgps', ['lcdgps.c'], parse_flags=gpslibs)
    88. 

  88. +env.Depends(lcdgps, compiled_gpslib)
    89. 

  89. +
    90. 

  90. +cgps = env.Program('cgps', ['cgps.c'], parse_flags=gpslibs + ncurseslibs)
    91. 

  91. +env.Depends(cgps, compiled_gpslib)
    92. 

  92. +
    93. 

  93. +ntpshmmon = env.Program('ntpshmmon', ['ntpshmmon.c'], parse_flags=gpslibs)
    94. 

  94. +env.Depends(ntpshmmon, compiled_gpslib)
    95. 

  95.  
    96. 

  96.  binaries = [gpsd, gpsdecode, gpsctl, gpsdctl, gpspipe, gps2udp, gpxlogger, lcdgps, ntpshmmon]
    97. 

  97.  if env["ncurses"]:
    98. 

  98. -- 
    99. 

  99. 2.4.1
    100. 

  100. 

  101.