0001-misc-fixes-from-archlinux.patch 5.5 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218
  1. From e8f43832d401ad1e071e6860b2bf4a1e796d4356 Mon Sep 17 00:00:00 2001
  2. From: Adam Duskett <aduskett@gmail.com>
  3. Date: Fri, 28 Jul 2017 08:18:22 -0400
  4. Subject: [PATCH] Misc fixes from Archlinux
  5. Patch from:
  6. https://git.archlinux.org/svntogit/packages.git/plain/gsm/trunk/gsm.patch
  7. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
  8. Signed-off-by: Adam Duskett <aduskett@gmail.com>
  9. Refresh for 1.0.17
  10. ---
  11. Makefile | 84 ++++++++++++++++++++++++++++++++--------------------------------
  12. 1 file changed, 42 insertions(+), 42 deletions(-)
  13. diff --git a/Makefile b/Makefile
  14. index d5c0c90..ef61bd5 100644
  15. --- a/Makefile
  16. +++ b/Makefile
  17. @@ -44,7 +44,7 @@ WAV49 = -DWAV49
  18. # CCFLAGS = -c -O
  19. CC = gcc -ansi -pedantic
  20. -CCFLAGS = -c -O2 -DNeedFunctionPrototypes=1 -Wall -Wno-comment
  21. +CCFLAGS = -c -O2 -fPIC -DNeedFunctionPrototypes=1 -Wall -Wno-comment
  22. LD = $(CC)
  23. @@ -96,11 +96,11 @@ TOAST_INSTALL_MAN = $(TOAST_INSTALL_ROOT)/man/man1
  24. # Other tools
  25. SHELL = /bin/sh
  26. -LN = ln
  27. +LN = ln -s -f
  28. BASENAME = basename
  29. AR = ar
  30. ARFLAGS = cr
  31. -RMFLAGS =
  32. +RMFLAGS = -f
  33. FIND = find
  34. COMPRESS = compress
  35. COMPRESSFLAGS =
  36. @@ -139,7 +139,7 @@ LFLAGS = $(LDFLAGS) $(LDINC)
  37. # Targets
  38. -LIBGSM = $(LIB)/libgsm.a
  39. +LIBGSMSO = $(LIB)/libgsm.so
  40. TOAST = $(BIN)/toast
  41. UNTOAST = $(BIN)/untoast
  42. @@ -257,7 +257,7 @@ STUFF = ChangeLog \
  43. # Install targets
  44. GSM_INSTALL_TARGETS = \
  45. - $(GSM_INSTALL_LIB)/libgsm.a \
  46. + $(GSM_INSTALL_LIB)/libgsm.so \
  47. $(GSM_INSTALL_INC)/gsm.h \
  48. $(GSM_INSTALL_MAN)/gsm.3 \
  49. $(GSM_INSTALL_MAN)/gsm_explode.3 \
  50. @@ -279,7 +279,7 @@ TOAST_INSTALL_TARGETS = \
  51. # Target rules
  52. -all: $(LIBGSM) $(TOAST) $(TCAT) $(UNTOAST)
  53. +all: $(LIBGSMSO) $(TOAST) $(TCAT) $(UNTOAST)
  54. @-echo $(ROOT): Done.
  55. tst: $(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/test-result
  56. @@ -299,24 +299,23 @@ install: toastinstall gsminstall
  57. # The basic API: libgsm
  58. -$(LIBGSM): $(LIB) $(GSM_OBJECTS)
  59. - -rm $(RMFLAGS) $(LIBGSM)
  60. - $(AR) $(ARFLAGS) $(LIBGSM) $(GSM_OBJECTS)
  61. - $(RANLIB) $(LIBGSM)
  62. -
  63. +$(LIBGSMSO): $(LIB) $(GSM_OBJECTS)
  64. + $(LD) -shared -Wl,-soname,libgsm.so.1 -o $@.1.0.13 $(GSM_OBJECTS)
  65. + $(LN) libgsm.so.1.0.13 $(LIBGSMSO).1
  66. + $(LN) libgsm.so.1.0.13 $(LIBGSMSO)
  67. # Toast, Untoast and Tcat -- the compress-like frontends to gsm.
  68. -$(TOAST): $(BIN) $(TOAST_OBJECTS) $(LIBGSM)
  69. - $(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) $(LIBGSM) $(LDLIB)
  70. +$(TOAST): $(BIN) $(TOAST_OBJECTS) $(LIBGSMSO)
  71. + $(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) $(LIBGSMSO) $(LDLIB)
  72. $(UNTOAST): $(BIN) $(TOAST)
  73. -rm $(RMFLAGS) $(UNTOAST)
  74. - $(LN) $(TOAST) $(UNTOAST)
  75. + $(LN) toast $(UNTOAST)
  76. $(TCAT): $(BIN) $(TOAST)
  77. -rm $(RMFLAGS) $(TCAT)
  78. - $(LN) $(TOAST) $(TCAT)
  79. + $(LN) toast $(TCAT)
  80. # The local bin and lib directories
  81. @@ -351,53 +350,54 @@ toastuninstall:
  82. fi
  83. $(TOAST_INSTALL_BIN)/toast: $(TOAST)
  84. - -rm $@
  85. + -rm $(RMFLAGS) $@
  86. cp $(TOAST) $@
  87. chmod 755 $@
  88. $(TOAST_INSTALL_BIN)/untoast: $(TOAST_INSTALL_BIN)/toast
  89. - -rm $@
  90. - ln $? $@
  91. + -rm $(RMFLAGS) $@
  92. + $(LN) toast $@
  93. $(TOAST_INSTALL_BIN)/tcat: $(TOAST_INSTALL_BIN)/toast
  94. - -rm $@
  95. - ln $? $@
  96. + -rm $(RMFLAGS) $@
  97. + $(LN) toast $@
  98. $(TOAST_INSTALL_MAN)/toast.1: $(MAN)/toast.1
  99. - -rm $@
  100. + -rm $(RMFLAGS) $@
  101. cp $? $@
  102. chmod 444 $@
  103. $(GSM_INSTALL_MAN)/gsm.3: $(MAN)/gsm.3
  104. - -rm $@
  105. + -rm $(RMFLAGS) $@
  106. cp $? $@
  107. chmod 444 $@
  108. $(GSM_INSTALL_MAN)/gsm_option.3: $(MAN)/gsm_option.3
  109. - -rm $@
  110. + -rm $(RMFLAGS) $@
  111. cp $? $@
  112. chmod 444 $@
  113. $(GSM_INSTALL_MAN)/gsm_explode.3: $(MAN)/gsm_explode.3
  114. - -rm $@
  115. + -rm $(RMFLAGS) $@
  116. cp $? $@
  117. chmod 444 $@
  118. $(GSM_INSTALL_MAN)/gsm_print.3: $(MAN)/gsm_print.3
  119. - -rm $@
  120. + -rm $(RMFLAGS) $@
  121. cp $? $@
  122. chmod 444 $@
  123. $(GSM_INSTALL_INC)/gsm.h: $(INC)/gsm.h
  124. - -rm $@
  125. - cp $? $@
  126. - chmod 444 $@
  127. -
  128. -$(GSM_INSTALL_LIB)/libgsm.a: $(LIBGSM)
  129. - -rm $@
  130. + -rm $(RMFLAGS) $@
  131. cp $? $@
  132. chmod 444 $@
  133. +$(GSM_INSTALL_LIB)/libgsm.so: $(LIBGSMSO)
  134. + -rm $(RMFLAGS) $@ $@.1 $@.1.0.13
  135. + cp $?.1.0.13 $@.1.0.13
  136. + chmod 755 $@.1.0.13
  137. + $(LN) libgsm.so.1.0.13 $@
  138. + $(LN) libgsm.so.1.0.13 $@.1
  139. # Distribution
  140. @@ -425,7 +425,7 @@ semi-clean:
  141. -print | xargs rm $(RMFLAGS)
  142. clean: semi-clean
  143. - -rm $(RMFLAGS) $(LIBGSM) $(ADDTST)/add \
  144. + -rm $(RMFLAGS) $(LIBGSMSO)* $(ADDTST)/add \
  145. $(TOAST) $(TCAT) $(UNTOAST) \
  146. $(ROOT)/gsm-1.0.tar.Z
  147. @@ -473,22 +473,22 @@ $(ADDTST)/add: $(ADDTST)/add_test.o
  148. $(TST)/test-result: $(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/run
  149. ( cd $(TST); ./run )
  150. -$(TST)/lin2txt: $(TST)/lin2txt.o $(LIBGSM)
  151. +$(TST)/lin2txt: $(TST)/lin2txt.o $(LIBGSMSO)
  152. $(LD) $(LFLAGS) -o $(TST)/lin2txt \
  153. - $(TST)/lin2txt.o $(LIBGSM) $(LDLIB)
  154. + $(TST)/lin2txt.o $(LIBGSMSO) $(LDLIB)
  155. -$(TST)/lin2cod: $(TST)/lin2cod.o $(LIBGSM)
  156. +$(TST)/lin2cod: $(TST)/lin2cod.o $(LIBGSMSO)
  157. $(LD) $(LFLAGS) -o $(TST)/lin2cod \
  158. - $(TST)/lin2cod.o $(LIBGSM) $(LDLIB)
  159. + $(TST)/lin2cod.o $(LIBGSMSO) $(LDLIB)
  160. -$(TST)/gsm2cod: $(TST)/gsm2cod.o $(LIBGSM)
  161. +$(TST)/gsm2cod: $(TST)/gsm2cod.o $(LIBGSMSO)
  162. $(LD) $(LFLAGS) -o $(TST)/gsm2cod \
  163. - $(TST)/gsm2cod.o $(LIBGSM) $(LDLIB)
  164. + $(TST)/gsm2cod.o $(LIBGSMSO) $(LDLIB)
  165. -$(TST)/cod2txt: $(TST)/cod2txt.o $(LIBGSM)
  166. +$(TST)/cod2txt: $(TST)/cod2txt.o $(LIBGSMSO)
  167. $(LD) $(LFLAGS) -o $(TST)/cod2txt \
  168. - $(TST)/cod2txt.o $(LIBGSM) $(LDLIB)
  169. + $(TST)/cod2txt.o $(LIBGSMSO) $(LDLIB)
  170. -$(TST)/cod2lin: $(TST)/cod2lin.o $(LIBGSM)
  171. +$(TST)/cod2lin: $(TST)/cod2lin.o $(LIBGSMSO)
  172. $(LD) $(LFLAGS) -o $(TST)/cod2lin \
  173. - $(TST)/cod2lin.o $(LIBGSM) $(LDLIB)
  174. + $(TST)/cod2lin.o $(LIBGSMSO) $(LDLIB)
  175. --
  176. 2.13.3