package/schifra: move -o option from OPTIONS to build commands

PATCH New Max Filippov 2 participants 4 messages Oct 28, 2014

lore

Share & tools

lore

Max Filippov

author

2014-10-28 06:17 UTC #0 lore raw

PATCH 1/1 package/schifra: move -o option from OPTIONS to build commands

This allows redefining OPTIONS w/o risk of having too many or too few -o in the end of it.

Signed-off-by Max Filippov <[email protected]>

---
 package/schifra/0001-fix-makefile-options.patch |  119 +++++++++++++++++++++++
 1 files changed, 119 insertions(+), 0 deletions(-)
 create mode 100644 package/schifra/0001-fix-makefile-options.patch

package/schifra/0001-fix-makefile-options.patch new file +119 -0

new file mode 100644
index 0000000..c8395e9
@@ -0,0 +1,119 @@
+Move -o option from OPTIONS to build commands
+
+This allows redefining OPTIONS w/o risk of having too many or too few -o
+in the end of it.
+
+Signed-off-by: Max Filippov <[email protected]>
+
+--- schifra-0.0.1/Makefile	1999-12-31 17:00:00.000000000 +0300
++++ schifra-0.0.1/Makefile.new	2014-10-28 10:07:19.000000000 +0400
+@@ -22,7 +22,7 @@
+ 
+ COMPILER         = -c++
+ OPTIMIZATION_OPT = -O3
+-OPTIONS          = -ansi -pedantic-errors -Wall -Wextra -Werror -Wno-long-long -lstdc++ $(OPTIMIZATION_OPT) -o
++OPTIONS          = -ansi -pedantic-errors -Wall -Wextra -Werror -Wno-long-long -lstdc++ $(OPTIMIZATION_OPT)
+ 
+ HPP_SRC+=schifra_galois_field_polynomial.hpp
+ HPP_SRC+=schifra_galois_field.hpp
+@@ -70,76 +70,76 @@
+ 	./schifra_reed_solomon_speed_evaluation
+ 
+ schifra_reed_solomon_codec_validation: schifra_reed_solomon_codec_validation.cpp $(HPP_SRC)
+-	$(COMPILER) $(OPTIONS) schifra_reed_solomon_codec_validation schifra_reed_solomon_codec_validation.cpp
++	$(COMPILER) $(OPTIONS) -o schifra_reed_solomon_codec_validation schifra_reed_solomon_codec_validation.cpp
+ 
+ schifra_reed_solomon_speed_evaluation: schifra_reed_solomon_speed_evaluation.cpp $(HPP_SRC)
+-	$(COMPILER) $(OPTIONS) schifra_reed_solomon_speed_evaluation schifra_reed_solomon_speed_evaluation.cpp
++	$(COMPILER) $(OPTIONS) -o schifra_reed_solomon_speed_evaluation schifra_reed_solomon_speed_evaluation.cpp
+ 
+ schifra_reed_solomon_file_encoding_example: schifra_reed_solomon_file_encoding_example.cpp $(HPP_SRC)
+-	$(COMPILER) $(OPTIONS) schifra_reed_solomon_file_encoding_example schifra_reed_solomon_file_encoding_example.cpp
++	$(COMPILER) $(OPTIONS) -o schifra_reed_solomon_file_encoding_example schifra_reed_solomon_file_encoding_example.cpp
+ 
+ schifra_reed_solomon_file_decoding_example: schifra_reed_solomon_file_decoding_example.cpp $(HPP_SRC)
+-	$(COMPILER) $(OPTIONS) schifra_reed_solomon_file_decoding_example schifra_reed_solomon_file_decoding_example.cpp
++	$(COMPILER) $(OPTIONS) -o schifra_reed_solomon_file_decoding_example schifra_reed_solomon_file_decoding_example.cpp
+ 
+ schifra_reed_solomon_example01: schifra_reed_solomon_example01.cpp $(HPP_SRC)
+-	$(COMPILER) $(OPTIONS) schifra_reed_solomon_example01 schifra_reed_solomon_example01.cpp
++	$(COMPILER) $(OPTIONS) -o schifra_reed_solomon_example01 schifra_reed_solomon_example01.cpp
+ 
+ schifra_reed_solomon_example02: schifra_reed_solomon_example02.cpp $(HPP_SRC)
+-	$(COMPILER) $(OPTIONS) schifra_reed_solomon_example02 schifra_reed_solomon_example02.cpp
++	$(COMPILER) $(OPTIONS) -o schifra_reed_solomon_example02 schifra_reed_solomon_example02.cpp
+ 
+ schifra_reed_solomon_example03: schifra_reed_solomon_example03.cpp $(HPP_SRC)
+-	$(COMPILER) $(OPTIONS) schifra_reed_solomon_example03 schifra_reed_solomon_example03.cpp
++	$(COMPILER) $(OPTIONS) -o schifra_reed_solomon_example03 schifra_reed_solomon_example03.cpp
+ 
+ schifra_reed_solomon_example04: schifra_reed_solomon_example04.cpp $(HPP_SRC)
+-	$(COMPILER) $(OPTIONS) schifra_reed_solomon_example04 schifra_reed_solomon_example04.cpp
++	$(COMPILER) $(OPTIONS) -o schifra_reed_solomon_example04 schifra_reed_solomon_example04.cpp
+ 
+ schifra_reed_solomon_example05: schifra_reed_solomon_example05.cpp $(HPP_SRC)
+-	$(COMPILER) $(OPTIONS) schifra_reed_solomon_example05 schifra_reed_solomon_example05.cpp
++	$(COMPILER) $(OPTIONS) -o schifra_reed_solomon_example05 schifra_reed_solomon_example05.cpp
+ 
+ schifra_reed_solomon_example06: schifra_reed_solomon_example06.cpp $(HPP_SRC)
+-	$(COMPILER) $(OPTIONS) schifra_reed_solomon_example06 schifra_reed_solomon_example06.cpp
++	$(COMPILER) $(OPTIONS) -o schifra_reed_solomon_example06 schifra_reed_solomon_example06.cpp
+ 
+ schifra_reed_solomon_example07: schifra_reed_solomon_example07.cpp $(HPP_SRC)
+-	$(COMPILER) $(OPTIONS) schifra_reed_solomon_example07 schifra_reed_solomon_example07.cpp
++	$(COMPILER) $(OPTIONS) -o schifra_reed_solomon_example07 schifra_reed_solomon_example07.cpp
+ 
+ schifra_reed_solomon_example08: schifra_reed_solomon_example08.cpp $(HPP_SRC)
+-	$(COMPILER) $(OPTIONS) schifra_reed_solomon_example08 schifra_reed_solomon_example08.cpp
++	$(COMPILER) $(OPTIONS) -o schifra_reed_solomon_example08 schifra_reed_solomon_example08.cpp
+ 
+ schifra_interleaving_example01: schifra_interleaving_example01.cpp $(HPP_SRC)
+-	$(COMPILER) $(OPTIONS) schifra_interleaving_example01 schifra_interleaving_example01.cpp
++	$(COMPILER) $(OPTIONS) -o schifra_interleaving_example01 schifra_interleaving_example01.cpp
+ 
+ schifra_interleaving_example02: schifra_interleaving_example02.cpp $(HPP_SRC)
+-	$(COMPILER) $(OPTIONS) schifra_interleaving_example02 schifra_interleaving_example02.cpp
++	$(COMPILER) $(OPTIONS) -o schifra_interleaving_example02 schifra_interleaving_example02.cpp
+ 
+ schifra_interleaving_example03: schifra_interleaving_example03.cpp $(HPP_SRC)
+-	$(COMPILER) $(OPTIONS) schifra_interleaving_example03 schifra_interleaving_example03.cpp
++	$(COMPILER) $(OPTIONS) -o schifra_interleaving_example03 schifra_interleaving_example03.cpp
+ 
+ schifra_reed_solomon_file_interleaving_example: schifra_reed_solomon_file_interleaving_example.cpp $(HPP_SRC)
+-	$(COMPILER) $(OPTIONS) schifra_reed_solomon_file_interleaving_example schifra_reed_solomon_file_interleaving_example.cpp
++	$(COMPILER) $(OPTIONS) -o schifra_reed_solomon_file_interleaving_example schifra_reed_solomon_file_interleaving_example.cpp
+ 
+ schifra_bitio_example01: schifra_bitio_example01.cpp $(HPP_SRC)
+-	$(COMPILER) $(OPTIONS) schifra_bitio_example01 schifra_bitio_example01.cpp
++	$(COMPILER) $(OPTIONS) -o schifra_bitio_example01 schifra_bitio_example01.cpp
+ 
+ schifra_bitio_example02: schifra_bitio_example02.cpp $(HPP_SRC)
+-	$(COMPILER) $(OPTIONS) schifra_bitio_example02 schifra_bitio_example02.cpp
++	$(COMPILER) $(OPTIONS) -o schifra_bitio_example02 schifra_bitio_example02.cpp
+ 
+ schifra_erasure_channel_example01: schifra_erasure_channel_example01.cpp $(HPP_SRC)
+-	$(COMPILER) $(OPTIONS) schifra_erasure_channel_example01 schifra_erasure_channel_example01.cpp
++	$(COMPILER) $(OPTIONS) -o schifra_erasure_channel_example01 schifra_erasure_channel_example01.cpp
+ 
+ schifra_erasure_channel_example02: schifra_erasure_channel_example02.cpp $(HPP_SRC)
+-	$(COMPILER) $(OPTIONS) schifra_erasure_channel_example02 schifra_erasure_channel_example02.cpp
++	$(COMPILER) $(OPTIONS) -o schifra_erasure_channel_example02 schifra_erasure_channel_example02.cpp
+ 
+ schifra_reed_solomon_gencodec_example: schifra_reed_solomon_gencodec_example.cpp $(HPP_SRC)
+-	$(COMPILER) $(OPTIONS) schifra_reed_solomon_gencodec_example schifra_reed_solomon_gencodec_example.cpp
++	$(COMPILER) $(OPTIONS) -o schifra_reed_solomon_gencodec_example schifra_reed_solomon_gencodec_example.cpp
+ 
+ schifra_reed_solomon_product_code_example : schifra_reed_solomon_product_code_example.cpp $(HPP_SRC)
+-	$(COMPILER) $(OPTIONS) schifra_reed_solomon_product_code_example schifra_reed_solomon_product_code_example.cpp
++	$(COMPILER) $(OPTIONS) -o schifra_reed_solomon_product_code_example schifra_reed_solomon_product_code_example.cpp
+ 
+ schifra_reed_solomon_threads_example01: schifra_reed_solomon_threads_example01.cpp $(HPP_SRC)
+-	$(COMPILER) $(OPTIONS) schifra_reed_solomon_threads_example01 schifra_reed_solomon_threads_example01.cpp -pthread -lboost_thread
++	$(COMPILER) $(OPTIONS) -o schifra_reed_solomon_threads_example01 schifra_reed_solomon_threads_example01.cpp -pthread -lboost_thread
+ 
+ schifra_reed_solomon_threads_example02: schifra_reed_solomon_threads_example02.cpp $(HPP_SRC)
+-	$(COMPILER) $(OPTIONS) schifra_reed_solomon_threads_example02 schifra_reed_solomon_threads_example02.cpp -pthread -lboost_thread
++	$(COMPILER) $(OPTIONS) -o schifra_reed_solomon_threads_example02 schifra_reed_solomon_threads_example02.cpp -pthread -lboost_thread
+ 
+ clean:
+ 	rm -f core.* *.o *.bak *stackdump *~

Signature · 1 line

1.7.7.6

Arnout Vandecappelle

2014-10-28 08:08 UTC #1 lore raw

PATCH 1/1 package/schifra: move -o option from OPTIONS to build commands

Quoted 20 lines · Max Filippov

This allows redefining OPTIONS w/o risk of having too many or too few -o in the end of it.
Signed-off-by Max Filippov <[email protected]>
---
 package/schifra/0001-fix-makefile-options.patch |  119 +++++++++++++++++++++++
 1 files changed, 119 insertions(+), 0 deletions(-)
 create mode 100644 package/schifra/0001-fix-makefile-options.patch
package/schifra/0001-fix-makefile-options.patch new file +5 -0
new file mode 100644
index 0000000..c8395e9
@@ -0,0 +1,119 @@
+Move -o option from OPTIONS to build commands
+
+This allows redefining OPTIONS w/o risk of having too many or too few -o
+in the end of it.
+

package/schifra/0001-fix-makefile-options.patch line 15

Quoted 10 lines

package/schifra/0001-fix-makefile-options.patch new file +10 -0

+Signed-off-by: Max Filippov <[email protected]>
+
+--- schifra-0.0.1/Makefile	1999-12-31 17:00:00.000000000 +0300
++++ schifra-0.0.1/Makefile.new	2014-10-28 10:07:19.000000000 +0400
+@@ -22,7 +22,7 @@
+ 
+ COMPILER         = -c++
+ OPTIMIZATION_OPT = -O3
+-OPTIONS          = -ansi -pedantic-errors -Wall -Wextra -Werror -Wno-long-long -lstdc++ $(OPTIMIZATION_OPT) -o
++OPTIONS          = -ansi -pedantic-errors -Wall -Wextra -Werror -Wno-long-long -lstdc++ $(OPTIMIZATION_OPT)

This patch doesn't apply to my schifra... In fact, the Makefile in my schifra
looks as if this patch has already been applied! So I think upstream has changed the tarball without changing the version (well, actually, there is no version in the tarball, but the Makefile etc. still claim it's version 0.0.1).

This thing desperately needs a hash! My schifra.tgz has sh256sum
3e60478cf024d87735d1cc1460aa2176c449e6c7f76914eefda25d3b20d22522 schifra.tgz

Regards,
Arnout

Quoted 105 lines

package/schifra/0001-fix-makefile-options.patch new file +104 -0

+ 
+ HPP_SRC+=schifra_galois_field_polynomial.hpp
+ HPP_SRC+=schifra_galois_field.hpp
+@@ -70,76 +70,76 @@
+ 	./schifra_reed_solomon_speed_evaluation
+ 
+ schifra_reed_solomon_codec_validation: schifra_reed_solomon_codec_validation.cpp $(HPP_SRC)
+-	$(COMPILER) $(OPTIONS) schifra_reed_solomon_codec_validation schifra_reed_solomon_codec_validation.cpp
++	$(COMPILER) $(OPTIONS) -o schifra_reed_solomon_codec_validation schifra_reed_solomon_codec_validation.cpp
+ 
+ schifra_reed_solomon_speed_evaluation: schifra_reed_solomon_speed_evaluation.cpp $(HPP_SRC)
+-	$(COMPILER) $(OPTIONS) schifra_reed_solomon_speed_evaluation schifra_reed_solomon_speed_evaluation.cpp
++	$(COMPILER) $(OPTIONS) -o schifra_reed_solomon_speed_evaluation schifra_reed_solomon_speed_evaluation.cpp
+ 
+ schifra_reed_solomon_file_encoding_example: schifra_reed_solomon_file_encoding_example.cpp $(HPP_SRC)
+-	$(COMPILER) $(OPTIONS) schifra_reed_solomon_file_encoding_example schifra_reed_solomon_file_encoding_example.cpp
++	$(COMPILER) $(OPTIONS) -o schifra_reed_solomon_file_encoding_example schifra_reed_solomon_file_encoding_example.cpp
+ 
+ schifra_reed_solomon_file_decoding_example: schifra_reed_solomon_file_decoding_example.cpp $(HPP_SRC)
+-	$(COMPILER) $(OPTIONS) schifra_reed_solomon_file_decoding_example schifra_reed_solomon_file_decoding_example.cpp
++	$(COMPILER) $(OPTIONS) -o schifra_reed_solomon_file_decoding_example schifra_reed_solomon_file_decoding_example.cpp
+ 
+ schifra_reed_solomon_example01: schifra_reed_solomon_example01.cpp $(HPP_SRC)
+-	$(COMPILER) $(OPTIONS) schifra_reed_solomon_example01 schifra_reed_solomon_example01.cpp
++	$(COMPILER) $(OPTIONS) -o schifra_reed_solomon_example01 schifra_reed_solomon_example01.cpp
+ 
+ schifra_reed_solomon_example02: schifra_reed_solomon_example02.cpp $(HPP_SRC)
+-	$(COMPILER) $(OPTIONS) schifra_reed_solomon_example02 schifra_reed_solomon_example02.cpp
++	$(COMPILER) $(OPTIONS) -o schifra_reed_solomon_example02 schifra_reed_solomon_example02.cpp
+ 
+ schifra_reed_solomon_example03: schifra_reed_solomon_example03.cpp $(HPP_SRC)
+-	$(COMPILER) $(OPTIONS) schifra_reed_solomon_example03 schifra_reed_solomon_example03.cpp
++	$(COMPILER) $(OPTIONS) -o schifra_reed_solomon_example03 schifra_reed_solomon_example03.cpp
+ 
+ schifra_reed_solomon_example04: schifra_reed_solomon_example04.cpp $(HPP_SRC)
+-	$(COMPILER) $(OPTIONS) schifra_reed_solomon_example04 schifra_reed_solomon_example04.cpp
++	$(COMPILER) $(OPTIONS) -o schifra_reed_solomon_example04 schifra_reed_solomon_example04.cpp
+ 
+ schifra_reed_solomon_example05: schifra_reed_solomon_example05.cpp $(HPP_SRC)
+-	$(COMPILER) $(OPTIONS) schifra_reed_solomon_example05 schifra_reed_solomon_example05.cpp
++	$(COMPILER) $(OPTIONS) -o schifra_reed_solomon_example05 schifra_reed_solomon_example05.cpp
+ 
+ schifra_reed_solomon_example06: schifra_reed_solomon_example06.cpp $(HPP_SRC)
+-	$(COMPILER) $(OPTIONS) schifra_reed_solomon_example06 schifra_reed_solomon_example06.cpp
++	$(COMPILER) $(OPTIONS) -o schifra_reed_solomon_example06 schifra_reed_solomon_example06.cpp
+ 
+ schifra_reed_solomon_example07: schifra_reed_solomon_example07.cpp $(HPP_SRC)
+-	$(COMPILER) $(OPTIONS) schifra_reed_solomon_example07 schifra_reed_solomon_example07.cpp
++	$(COMPILER) $(OPTIONS) -o schifra_reed_solomon_example07 schifra_reed_solomon_example07.cpp
+ 
+ schifra_reed_solomon_example08: schifra_reed_solomon_example08.cpp $(HPP_SRC)
+-	$(COMPILER) $(OPTIONS) schifra_reed_solomon_example08 schifra_reed_solomon_example08.cpp
++	$(COMPILER) $(OPTIONS) -o schifra_reed_solomon_example08 schifra_reed_solomon_example08.cpp
+ 
+ schifra_interleaving_example01: schifra_interleaving_example01.cpp $(HPP_SRC)
+-	$(COMPILER) $(OPTIONS) schifra_interleaving_example01 schifra_interleaving_example01.cpp
++	$(COMPILER) $(OPTIONS) -o schifra_interleaving_example01 schifra_interleaving_example01.cpp
+ 
+ schifra_interleaving_example02: schifra_interleaving_example02.cpp $(HPP_SRC)
+-	$(COMPILER) $(OPTIONS) schifra_interleaving_example02 schifra_interleaving_example02.cpp
++	$(COMPILER) $(OPTIONS) -o schifra_interleaving_example02 schifra_interleaving_example02.cpp
+ 
+ schifra_interleaving_example03: schifra_interleaving_example03.cpp $(HPP_SRC)
+-	$(COMPILER) $(OPTIONS) schifra_interleaving_example03 schifra_interleaving_example03.cpp
++	$(COMPILER) $(OPTIONS) -o schifra_interleaving_example03 schifra_interleaving_example03.cpp
+ 
+ schifra_reed_solomon_file_interleaving_example: schifra_reed_solomon_file_interleaving_example.cpp $(HPP_SRC)
+-	$(COMPILER) $(OPTIONS) schifra_reed_solomon_file_interleaving_example schifra_reed_solomon_file_interleaving_example.cpp
++	$(COMPILER) $(OPTIONS) -o schifra_reed_solomon_file_interleaving_example schifra_reed_solomon_file_interleaving_example.cpp
+ 
+ schifra_bitio_example01: schifra_bitio_example01.cpp $(HPP_SRC)
+-	$(COMPILER) $(OPTIONS) schifra_bitio_example01 schifra_bitio_example01.cpp
++	$(COMPILER) $(OPTIONS) -o schifra_bitio_example01 schifra_bitio_example01.cpp
+ 
+ schifra_bitio_example02: schifra_bitio_example02.cpp $(HPP_SRC)
+-	$(COMPILER) $(OPTIONS) schifra_bitio_example02 schifra_bitio_example02.cpp
++	$(COMPILER) $(OPTIONS) -o schifra_bitio_example02 schifra_bitio_example02.cpp
+ 
+ schifra_erasure_channel_example01: schifra_erasure_channel_example01.cpp $(HPP_SRC)
+-	$(COMPILER) $(OPTIONS) schifra_erasure_channel_example01 schifra_erasure_channel_example01.cpp
++	$(COMPILER) $(OPTIONS) -o schifra_erasure_channel_example01 schifra_erasure_channel_example01.cpp
+ 
+ schifra_erasure_channel_example02: schifra_erasure_channel_example02.cpp $(HPP_SRC)
+-	$(COMPILER) $(OPTIONS) schifra_erasure_channel_example02 schifra_erasure_channel_example02.cpp
++	$(COMPILER) $(OPTIONS) -o schifra_erasure_channel_example02 schifra_erasure_channel_example02.cpp
+ 
+ schifra_reed_solomon_gencodec_example: schifra_reed_solomon_gencodec_example.cpp $(HPP_SRC)
+-	$(COMPILER) $(OPTIONS) schifra_reed_solomon_gencodec_example schifra_reed_solomon_gencodec_example.cpp
++	$(COMPILER) $(OPTIONS) -o schifra_reed_solomon_gencodec_example schifra_reed_solomon_gencodec_example.cpp
+ 
+ schifra_reed_solomon_product_code_example : schifra_reed_solomon_product_code_example.cpp $(HPP_SRC)
+-	$(COMPILER) $(OPTIONS) schifra_reed_solomon_product_code_example schifra_reed_solomon_product_code_example.cpp
++	$(COMPILER) $(OPTIONS) -o schifra_reed_solomon_product_code_example schifra_reed_solomon_product_code_example.cpp
+ 
+ schifra_reed_solomon_threads_example01: schifra_reed_solomon_threads_example01.cpp $(HPP_SRC)
+-	$(COMPILER) $(OPTIONS) schifra_reed_solomon_threads_example01 schifra_reed_solomon_threads_example01.cpp -pthread -lboost_thread
++	$(COMPILER) $(OPTIONS) -o schifra_reed_solomon_threads_example01 schifra_reed_solomon_threads_example01.cpp -pthread -lboost_thread
+ 
+ schifra_reed_solomon_threads_example02: schifra_reed_solomon_threads_example02.cpp $(HPP_SRC)
+-	$(COMPILER) $(OPTIONS) schifra_reed_solomon_threads_example02 schifra_reed_solomon_threads_example02.cpp -pthread -lboost_thread
++	$(COMPILER) $(OPTIONS) -o schifra_reed_solomon_threads_example02 schifra_reed_solomon_threads_example02.cpp -pthread -lboost_thread
+ 
+ clean:
+ 	rm -f core.* *.o *.bak *stackdump *~

Signature · 6 lines

Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F

Max Filippov

author

2014-10-28 08:25 UTC #2 lore raw

PATCH 1/1 package/schifra: move -o option from OPTIONS to build commands

Quoted 37 lines · Arnout Vandecappelle

Quoted 20 lines · Max Filippov
This allows redefining OPTIONS w/o risk of having too many or too few -o in the end of it.
Signed-off-by Max Filippov <[email protected]>
---
 package/schifra/0001-fix-makefile-options.patch |  119 +++++++++++++++++++++++
 1 files changed, 119 insertions(+), 0 deletions(-)
 create mode 100644 package/schifra/0001-fix-makefile-options.patch
package/schifra/0001-fix-makefile-options.patch new file +5 -0
new file mode 100644
index 0000000..c8395e9
@@ -0,0 +1,119 @@
+Move -o option from OPTIONS to build commands
+
+This allows redefining OPTIONS w/o risk of having too many or too few -o
+in the end of it.
+
package/schifra/0001-fix-makefile-options.patch line 15
Quoted 10 lines
package/schifra/0001-fix-makefile-options.patch new file +10 -0
+Signed-off-by: Max Filippov <[email protected]>
+
+--- schifra-0.0.1/Makefile   1999-12-31 17:00:00.000000000 +0300
++++ schifra-0.0.1/Makefile.new       2014-10-28 10:07:19.000000000 +0400
+@@ -22,7 +22,7 @@
+
+ COMPILER         = -c++
+ OPTIMIZATION_OPT = -O3
+-OPTIONS          = -ansi -pedantic-errors -Wall -Wextra -Werror -Wno-long-long -lstdc++ $(OPTIMIZATION_OPT) -o
++OPTIONS          = -ansi -pedantic-errors -Wall -Wextra -Werror -Wno-long-long -lstdc++ $(OPTIMIZATION_OPT)
This patch doesn't apply to my schifra... In fact, the Makefile in my schifra
looks as if this patch has already been applied! So I think upstream has changed the tarball without changing the version (well, actually, there is no version in the tarball, but the Makefile etc. still claim it's version 0.0.1).

Quoted 2 lines

This thing desperately needs a hash! My schifra.tgz has sh256sum
3e60478cf024d87735d1cc1460aa2176c449e6c7f76914eefda25d3b20d22522 schifra.tgz

Oh, great. That explains it. Mine:
df59cf287b7f8923ec28a99971673a48a4147d961ed0588f9fe0f62a4d09344e dl/schifra.tgz

Signature · 2 lines

Thanks.
-- Max

Max Filippov

author

2014-10-28 08:43 UTC #3 lore raw

PATCH 1/1 package/schifra: move -o option from OPTIONS to build commands

Quoted 38 lines · Max Filippov

Quoted 37 lines · Arnout Vandecappelle
Quoted 20 lines · Max Filippov
This allows redefining OPTIONS w/o risk of having too many or too few -o in the end of it.
Signed-off-by Max Filippov <[email protected]>
---
 package/schifra/0001-fix-makefile-options.patch |  119 +++++++++++++++++++++++
 1 files changed, 119 insertions(+), 0 deletions(-)
 create mode 100644 package/schifra/0001-fix-makefile-options.patch
package/schifra/0001-fix-makefile-options.patch new file +5 -0
new file mode 100644
index 0000000..c8395e9
@@ -0,0 +1,119 @@
+Move -o option from OPTIONS to build commands
+
+This allows redefining OPTIONS w/o risk of having too many or too few -o
+in the end of it.
+
package/schifra/0001-fix-makefile-options.patch line 15
Quoted 10 lines
package/schifra/0001-fix-makefile-options.patch new file +10 -0
+Signed-off-by: Max Filippov <[email protected]>
+
+--- schifra-0.0.1/Makefile   1999-12-31 17:00:00.000000000 +0300
++++ schifra-0.0.1/Makefile.new       2014-10-28 10:07:19.000000000 +0400
+@@ -22,7 +22,7 @@
+
+ COMPILER         = -c++
+ OPTIMIZATION_OPT = -O3
+-OPTIONS          = -ansi -pedantic-errors -Wall -Wextra -Werror -Wno-long-long -lstdc++ $(OPTIMIZATION_OPT) -o
++OPTIONS          = -ansi -pedantic-errors -Wall -Wextra -Werror -Wno-long-long -lstdc++ $(OPTIMIZATION_OPT)
This patch doesn't apply to my schifra... In fact, the Makefile in my schifra
looks as if this patch has already been applied! So I think upstream has changed the tarball without changing the version (well, actually, there is no version in the tarball, but the Makefile etc. still claim it's version 0.0.1).

Quoted 5 lines

Quoted 2 lines
This thing desperately needs a hash! My schifra.tgz has sh256sum
3e60478cf024d87735d1cc1460aa2176c449e6c7f76914eefda25d3b20d22522 schifra.tgz
Oh, great. That explains it. Mine:
df59cf287b7f8923ec28a99971673a48a4147d961ed0588f9fe0f62a4d09344e dl/schifra.tgz

My version was downloaded 2014-06-01, after removing and re-fetching it it builds well with your patch.

Signature · 2 lines

Thanks.
-- Max