aboutsummaryrefslogblamecommitdiffstats
path: root/testing/erlang/0003-Do-not-install-C-sources.patch
blob: 364c4ad7900c4641be4012b29353bb83262f5234 (plain) (tree)
1
2
3
4
5
6
7
8
9
10
11
12
13
14













                                                   
 


                                              
                                        
                                                                         
      




                                                


                                                   





                                                               
                                        





                                                                   
      


                                                        





















                                                                   


                                               





                                               

                                                    


                                                                      
                                                                             


                                                      







                                                                                  


                                                 










                                                                  


                                                   







                                                                  


                                                          




                                               
                                        

                                                                       
      
 


                                                  







                                                                         
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Fri, 18 Jun 2010 23:41:33 +0400
Subject: [PATCH] Do not install C sources

Don't install *.c and *.o files.

Excepts ones from the internal erl_interface. These
API headers are necessary. See rhbz #818419 for the
explanation why they're necessary for the low-level
interaction with the Erlang nodes:

https://bugzilla.redhat.com/818419

Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>

--- otp_src_18.0-orig/lib/asn1/c_src/Makefile
+++ otp_src_18.0-fixed/lib/asn1/c_src/Makefile
@@ -143,8 +143,6 @@
 ifneq ($(findstring ose,$(TARGET)),ose)
 	$(INSTALL_PROGRAM) $(NIF_SHARED_OBJ_FILE) "$(RELSYSDIR)/priv/lib"
 endif
-	$(INSTALL_DIR) "$(RELSYSDIR)/c_src"
-	$(INSTALL_DATA) *.c "$(RELSYSDIR)/c_src"
 
 release_docs_spec:
 
--- otp_src_18.0-orig/lib/crypto/c_src/Makefile.in
+++ otp_src_18.0-fixed/lib/crypto/c_src/Makefile.in
@@ -200,14 +200,10 @@
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) "$(RELSYSDIR)/priv/obj"
 	$(INSTALL_DIR) "$(RELSYSDIR)/priv/lib"
-	$(INSTALL_DATA) $(NIF_MAKEFILE) "$(RELSYSDIR)/priv/obj"
 ifneq ($(findstring ose,$(TARGET)),ose)
-	$(INSTALL_PROGRAM) $(CRYPTO_OBJS) "$(RELSYSDIR)/priv/obj"
 	$(INSTALL_PROGRAM) $(NIF_LIB) "$(RELSYSDIR)/priv/lib"
 ifeq ($(DYNAMIC_CRYPTO_LIB),yes)
-	$(INSTALL_PROGRAM) $(CALLBACK_OBJS) "$(RELSYSDIR)/priv/obj"
 	$(INSTALL_PROGRAM) $(CALLBACK_LIB) "$(RELSYSDIR)/priv/lib"
 endif
 endif
--- otp_src_18.0-orig/lib/erl_interface/src/Makefile.in
+++ otp_src_18.0-fixed/lib/erl_interface/src/Makefile.in
@@ -905,14 +905,14 @@
 	$(INSTALL_PROGRAM) $(EXE_TARGETS) "$(RELSYSDIR)/bin"
 endif
 	$(INSTALL_DATA) $(EXTRA)        "$(RELSYSDIR)/src"
-	$(INSTALL_DATA) connect/*.[ch]  "$(RELSYSDIR)/src/connect"
-	$(INSTALL_DATA) decode/*.[ch]   "$(RELSYSDIR)/src/decode"
-	$(INSTALL_DATA) encode/*.[ch]   "$(RELSYSDIR)/src/encode"
-	$(INSTALL_DATA) epmd/*.[ch]     "$(RELSYSDIR)/src/epmd"
-	$(INSTALL_DATA) misc/*.[ch]     "$(RELSYSDIR)/src/misc"
-	$(INSTALL_DATA) registry/*.[ch] "$(RELSYSDIR)/src/registry"
-	$(INSTALL_DATA) legacy/*.[ch]   "$(RELSYSDIR)/src/legacy"
-	$(INSTALL_DATA) prog/*.[ch]     "$(RELSYSDIR)/src/prog"
+	$(INSTALL_DATA) connect/*.h  "$(RELSYSDIR)/src/connect"
+	$(INSTALL_DATA) decode/*.h   "$(RELSYSDIR)/src/decode"
+	$(INSTALL_DATA) encode/*.h   "$(RELSYSDIR)/src/encode"
+	$(INSTALL_DATA) epmd/*.h     "$(RELSYSDIR)/src/epmd"
+	$(INSTALL_DATA) misc/*.h     "$(RELSYSDIR)/src/misc"
+	$(INSTALL_DATA) registry/*.h "$(RELSYSDIR)/src/registry"
+	$(INSTALL_DATA) legacy/*.h   "$(RELSYSDIR)/src/legacy"
+	$(INSTALL_DATA) prog/*.h     "$(RELSYSDIR)/src/prog"
 
 release_docs:
 
--- otp_src_18.0-orig/lib/ic/c_src/Makefile.in
+++ otp_src_18.0-fixed/lib/ic/c_src/Makefile.in
@@ -145,12 +145,10 @@
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) "$(RELSYSDIR)/c_src"
 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
 	$(INSTALL_DIR) "$(RELSYSDIR)/priv/lib"
 	$(INSTALL_DIR) "$(RELEASE_PATH)/usr/include"
 	$(INSTALL_DIR) "$(RELEASE_PATH)/usr/lib"
-	$(INSTALL_DATA) ic.c ic_tmo.c "$(RELSYSDIR)/c_src"
 	$(INSTALL_DATA) $(IDL_FILES) $(H_FILES) "$(RELSYSDIR)/include"
 	$(INSTALL_DATA) $(LIBRARY) "$(RELSYSDIR)/priv/lib"
 	$(INSTALL_DATA) $(IDL_FILES) $(H_FILES) "$(RELEASE_PATH)/usr/include"
--- otp_src_18.0-orig/lib/megaco/src/flex/Makefile.in
+++ otp_src_18.0-fixed/lib/megaco/src/flex/Makefile.in
@@ -271,7 +271,7 @@
 	$(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/flex"
 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 ifeq ($(ENABLE_MEGACO_FLEX_SCANNER),true)
-	$(INSTALL_DATA) $(FLEX_FILES) $(C_TARGETS) "$(RELSYSDIR)/src/flex"
+	$(INSTALL_DATA) $(FLEX_FILES) "$(RELSYSDIR)/src/flex"
 	$(INSTALL_PROGRAM) $(SOLIBS) "$(RELSYSDIR)/priv/lib"
 endif
 
--- otp_src_18.0-orig/lib/odbc/c_src/Makefile.in
+++ otp_src_18.0-fixed/lib/odbc/c_src/Makefile.in
@@ -129,11 +129,8 @@
 
 release_spec: opt
 ifdef EXE_TARGET
-	$(INSTALL_DIR) "$(RELSYSDIR)/c_src"
-	$(INSTALL_DATA) $(C_FILES) $(H_FILES) "$(RELSYSDIR)/c_src"
 	$(INSTALL_DIR) "$(RELSYSDIR)/priv"
 	$(INSTALL_DIR) "$(RELSYSDIR)/priv/bin"
-	$(INSTALL_DIR) "$(RELSYSDIR)/priv/obj"
 	$(INSTALL_PROGRAM) $(EXE_TARGET) "$(RELSYSDIR)/priv/bin"
 endif
 
--- otp_src_18.0-orig/lib/os_mon/c_src/Makefile.in
+++ otp_src_18.0-fixed/lib/os_mon/c_src/Makefile.in
@@ -126,8 +126,6 @@
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) "$(RELSYSDIR)/src"
-	$(INSTALL_DATA) $(C_FILES) "$(RELSYSDIR)/src"
 	$(INSTALL_DIR) "$(RELSYSDIR)/priv/bin"
 	$(INSTALL_PROGRAM) $(TARGET_FILES) "$(RELSYSDIR)/priv/bin"
 
--- otp_src_18.0-orig/lib/runtime_tools/c_src/Makefile.in
+++ otp_src_18.0-fixed/lib/runtime_tools/c_src/Makefile.in
@@ -157,10 +157,8 @@
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) "$(RELSYSDIR)/priv/obj"
 	$(INSTALL_DIR) "$(RELSYSDIR)/priv/lib"
 ifneq ($(findstring ose,$(TARGET)),ose)
-	$(INSTALL_PROGRAM) $(DYNTRACE_OBJS) "$(RELSYSDIR)/priv/obj"
 	$(INSTALL_PROGRAM) $(NIF_LIB) $(SOLIBS) "$(RELSYSDIR)/priv/lib"
 endif
 
--- otp_src_18.0-orig/lib/tools/c_src/Makefile.in
+++ otp_src_18.0-fixed/lib/tools/c_src/Makefile.in
@@ -198,8 +198,6 @@
 RELSYSDIR = $(RELEASE_PATH)/lib/tools-$(TOOLS_VSN)
 
 release_spec: all
-	$(INSTALL_DIR) "$(RELSYSDIR)/c_src"
-	$(INSTALL_DATA) $(EMEM_SRCS) $(EMEM_HEADERS) "$(RELSYSDIR)/c_src"
 ifneq ($(PROGS),)
 	$(INSTALL_DIR) "$(RELSYSDIR)/bin"
 	$(INSTALL_PROGRAM) $(PROGS) "$(RELSYSDIR)/bin"