diff options
| author | Jose Alonso Cardenas Marquez <acm@FreeBSD.org> | 2020-12-15 06:49:03 +0000 |
|---|---|---|
| committer | Jose Alonso Cardenas Marquez <acm@FreeBSD.org> | 2020-12-15 06:49:03 +0000 |
| commit | a7efd636bffba69d55ff39f7e8bf231c7eca8769 (patch) | |
| tree | efbb3b8eb0867ead9be47ec653961d81de4343ca /sysutils/bareos-server/files | |
| parent | 1dcfd8153d1d15812021387ae5581a1afe366179 (diff) | |
| download | ports-a7efd636bffba69d55ff39f7e8bf231c7eca8769.tar.gz ports-a7efd636bffba69d55ff39f7e8bf231c7eca8769.zip | |
- Update to 19.2.9
- Add CEPHFS option
- Add PERL5 like run dependency
- Fix pkg-plist
PR: 249072 250194
Submitted by: yasu _at_ utahime.org brad _at_ facefault.org
Notes
Notes:
svn path=/head/; revision=558143
Diffstat (limited to 'sysutils/bareos-server/files')
| -rw-r--r-- | sysutils/bareos-server/files/patch-core-cmake_BareosCheckIncludes.cmake | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/sysutils/bareos-server/files/patch-core-cmake_BareosCheckIncludes.cmake b/sysutils/bareos-server/files/patch-core-cmake_BareosCheckIncludes.cmake index 8b1643961cca..e7fe16ff0038 100644 --- a/sysutils/bareos-server/files/patch-core-cmake_BareosCheckIncludes.cmake +++ b/sysutils/bareos-server/files/patch-core-cmake_BareosCheckIncludes.cmake @@ -1,32 +1,32 @@ ---- core/cmake/BareosCheckIncludes.cmake 2020-02-03 01:03:16.451463000 -0500 -+++ core/cmake/BareosCheckIncludes.cmake 2020-02-03 01:07:12.138547000 -0500 -@@ -98,16 +98,20 @@ - check_include_files(sys/ea.h HAVE_SYS_EA_H) - check_include_files(sys/proplist.h HAVE_SYS_PROPLIST_H) +--- core/cmake/BareosCheckIncludes.cmake 2020-12-11 08:44:43.000000000 -0500 ++++ core/cmake/BareosCheckIncludes.cmake 2020-12-14 19:30:00.380545000 -0500 +@@ -100,21 +100,21 @@ check_include_files(sys/xattr.h HAVE_SYS_XATTR_H) --check_include_files(api/glfs.h HAVE_API_GLFS_H) -- --check_include_files(cephfs/libcephfs.h HAVE_CEPHFS_LIBCEPHFS_H) --check_include_files("sys/stat.h;cephfs/ceph_statx.h" HAVE_CEPHFS_CEPH_STATX_H) --check_include_files(rados/librados.h HAVE_RADOS_LIBRADOS_H) --check_include_files(radosstriper/libradosstriper.h -- HAVE_RADOSSTRIPER_LIBRADOSSTRIPER_H) + check_include_files(api/glfs.h HAVE_API_GLFS_H) + ++if(cephfs) + check_include_files(cephfs/libcephfs.h HAVE_CEPHFS_LIBCEPHFS_H) ++check_include_files("sys/stat.h;cephfs/ceph_ll_client.h" HAVE_CEPH_STATX) ++endif() + +-include(CheckSymbolExists) +-include(CMakePushCheckState) +-cmake_push_check_state() +-set(CMAKE_REQUIRED_LIBRARIES cephfs) +-check_symbol_exists(ceph_statx "sys/stat.h;cephfs/libcephfs.h" HAVE_CEPH_STATX) +-cmake_pop_check_state() - -+if(gfapi) -+ check_include_files(glusterfs/api/glfs.h HAVE_API_GLFS_H) ++if(rados) + check_include_files(rados/librados.h HAVE_RADOS_LIBRADOS_H) + check_include_files(radosstriper/libradosstriper.h + HAVE_RADOSSTRIPER_LIBRADOSSTRIPER_H) ++endif() + # CHECK_INCLUDE_FILES(glusterfs/glusterfs.h HAVE_GLUSTERFS_GLUSTERFS_H) -check_include_files(glusterfs/api/glfs.h HAVE_GLUSTERFS_API_GLFS_H) ++if(gfapi) + check_include_files(glusterfs/api/glfs.h HAVE_GLUSTERFS_API_GLFS_H) +endif() -+if(cephfs) -+ check_include_files(cephfs/libcephfs.h HAVE_CEPHFS_LIBCEPHFS_H) -+ check_include_files("sys/stat.h;cephfs/ceph_statx.h" HAVE_CEPHFS_CEPH_STATX_H) -+endif() -+if(rados) -+ check_include_files(rados/librados.h HAVE_RADOS_LIBRADOS_H) -+ check_include_files(radosstriper/libradosstriper.h -+ HAVE_RADOSSTRIPER_LIBRADOSSTRIPER_H) -+endif() check_include_files(elasto/data.h HAVE_ELASTO_DATA_H) check_include_files(elasto/file.h HAVE_ELASTO_FILE_H) |