Changeset View
Changeset View
Standalone View
Standalone View
head/net/ceph14/files/patch-src_CMakeLists.txt
| Property | Old Value | New Value |
|---|---|---|
| fbsd:nokeywords | null | yes \ No newline at end of property |
| svn:eol-style | null | native \ No newline at end of property |
| svn:mime-type | null | text/plain \ No newline at end of property |
| git diff src/CMakeLists.txt | |||||
| diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt | |||||
| index 60e261b10e..287ecc6600 100644 | |||||
| *** src/CMakeLists.txt.org 2019-09-27 10:19:32.501849000 +0200 | |||||
| --- src/CMakeLists.txt 2019-09-27 10:18:05.318965000 +0200 | |||||
| *************** | |||||
| *** 58,63 **** | |||||
| --- 58,68 ---- | |||||
| set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-varargs") | |||||
| set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-gnu-designator") | |||||
| set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-missing-braces -Wno-parentheses -Wno-deprecated-register") | |||||
| + if(FREEBSD) | |||||
| + # Need to use the GNU binutils linker to get versioning right. | |||||
| + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=/usr/local/bin/ld -Wno-unused-command-line-argument") | |||||
| + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=/usr/local/bin/ld -Wno-unused-command-line-argument") | |||||
| + endif() | |||||
| if(APPLE) | |||||
| set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -undefined dynamic_lookup") | |||||
| endif() | |||||
| *************** | |||||
| *** 516,522 **** | |||||
| INSTALL_RPATH "") | |||||
| install(TARGETS ceph-osd DESTINATION bin) | |||||
| ! if (WITH_CEPHFS) | |||||
| add_subdirectory(mds) | |||||
| set(ceph_mds_srcs | |||||
| ceph_mds.cc) | |||||
| --- 521,527 ---- | |||||
| INSTALL_RPATH "") | |||||
| install(TARGETS ceph-osd DESTINATION bin) | |||||
| ! if (WITH_CEPHFS OR FREEBSD) | |||||
| add_subdirectory(mds) | |||||
| set(ceph_mds_srcs | |||||
| ceph_mds.cc) | |||||