Jelajahi Sumber

Disabled unneeded usrsctp options inet and inet6

Paul-Louis Ageneau 3 tahun lalu
induk
melakukan
58b0432ac9
3 mengubah file dengan 7 tambahan dan 4 penghapusan
  1. 4 2
      CMakeLists.txt
  2. 1 1
      Jamfile
  3. 2 1
      Makefile

+ 4 - 2
CMakeLists.txt

@@ -206,8 +206,10 @@ add_subdirectory(deps/plog EXCLUDE_FROM_ALL)
 if(SCTP_DEBUG)
 	add_definitions(-DSCTP_DEBUG)
 endif()
-option(sctp_build_programs 0)
-option(sctp_build_shared_lib 0)
+option(sctp_build_shared_lib OFF)
+option(sctp_build_programs OFF)
+option(sctp_inet OFF)
+option(sctp_inet6 OFF)
 set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
 add_subdirectory(deps/usrsctp EXCLUDE_FROM_ALL)
 if (MSYS OR MINGW)

+ 1 - 1
Jamfile

@@ -99,7 +99,7 @@ rule make_libusrsctp ( targets * : sources * : properties * )
 }
 actions make_libusrsctp
 {
-    (cd $(CWD)/deps/usrsctp && mkdir -p $(BUILD_DIR) && cd $(BUILD_DIR) && cmake -DCMAKE_BUILD_TYPE=$(VARIANT) -DCMAKE_C_FLAGS="-fPIC -Wno-unknown-warning-option -Wno-format-truncation" -Dsctp_build_shared_lib=0 -Dsctp_build_programs=0 .. && make -j2 usrsctp)
+    (cd $(CWD)/deps/usrsctp && mkdir -p $(BUILD_DIR) && cd $(BUILD_DIR) && cmake -DCMAKE_BUILD_TYPE=$(VARIANT) -DCMAKE_C_FLAGS="-fPIC -Wno-unknown-warning-option -Wno-format-truncation" -Dsctp_build_shared_lib=0 -Dsctp_build_programs=0 -Dsctp_inet=0 -Dsctp_inet6=0 .. && make -j2 usrsctp)
     cp $(CWD)/deps/usrsctp/$(BUILD_DIR)/usrsctplib/libusrsctp.a $(<)
 }
 rule make_libusrsctp_msvc ( targets * : sources * : properties * )

+ 2 - 1
Makefile

@@ -113,7 +113,8 @@ dist-clean: clean
 libusrsctp.a:
 	cd $(USRSCTP_DIR) && \
 		./bootstrap && \
-		./configure --enable-static --disable-debug CFLAGS="-fPIC" && \
+		./configure --enable-static --disable-programs --disable-debug \
+			--disable-inet --disable-inet6 CFLAGS="-fPIC" && \
 		make
 	cp $(USRSCTP_DIR)/usrsctplib/.libs/libusrsctp.a .