Page MenuHomeFreeBSD
Files F105945411

D19504.diff
No OneTemporary
Actions

D19504.diff
View Options

Index: head/devel/pmdk/Makefile
===================================================================
--- head/devel/pmdk/Makefile
+++ head/devel/pmdk/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= pmdk
-DISTVERSION= 1.5
+DISTVERSION= 1.6.1
CATEGORIES= devel
MAINTAINER= d.scott.phillips@intel.com
@@ -19,11 +19,8 @@
USES= autoreconf:build gmake pkgconfig
USE_GITHUB= yes
-USE_LDCONFIG= yes
-
GH_ACCOUNT= pmem
-
-MAKE_ARGS= EXTRA_CFLAGS=-Wno-error=unused-value
+USE_LDCONFIG= yes
post-install:
${RM} ${STAGEDIR}${PREFIX}/bin/pmreorder
Index: head/devel/pmdk/distinfo
===================================================================
--- head/devel/pmdk/distinfo
+++ head/devel/pmdk/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1542399381
-SHA256 (pmem-pmdk-1.5_GH0.tar.gz) = 6b069d7207febeb62440e89245e8b18fcdf40b6170d2ec2ef33c252ed16db2d4
-SIZE (pmem-pmdk-1.5_GH0.tar.gz) = 2439245
+TIMESTAMP = 1567183026
+SHA256 (pmem-pmdk-1.6.1_GH0.tar.gz) = f263c8301f86ddf8bc5e020909ac52350baedba5c169a1a3a7786df64f129446
+SIZE (pmem-pmdk-1.6.1_GH0.tar.gz) = 2499478
Index: head/devel/pmdk/files/patch-src_Makefile.inc
===================================================================
--- head/devel/pmdk/files/patch-src_Makefile.inc
+++ head/devel/pmdk/files/patch-src_Makefile.inc
@@ -1,6 +1,6 @@
---- src/Makefile.inc.orig 2018-10-26 15:43:47 UTC
+--- src/Makefile.inc.orig 2019-08-27 15:43:26 UTC
+++ src/Makefile.inc
-@@ -294,7 +294,7 @@ install: all
+@@ -300,7 +300,7 @@ install: all
ifneq ($(LIBRARY_NAME),)
$(INSTALL) -d $(LIBS_DESTDIR)
$(INSTALL) -p -m 0755 $(TARGET_LIBS) $(LIBS_DESTDIR)
Index: head/devel/pmdk/files/patch-src_common.inc
===================================================================
--- head/devel/pmdk/files/patch-src_common.inc
+++ head/devel/pmdk/files/patch-src_common.inc
@@ -1,17 +1,6 @@
---- src/common.inc.orig 2018-10-26 15:43:47 UTC
+--- src/common.inc.orig 2019-08-27 15:43:26 UTC
+++ src/common.inc
-@@ -85,9 +85,7 @@ endif
- osdep = $(1)_$(shell echo $(OS_KERNEL_NAME) | tr "[:upper:]" "[:lower:]")$(2)
-
- get_arch = $(shell $(CC) -dumpmachine | awk -F'[/-]' '{print $$1}')
--ifeq ($(ARCH),)
--export ARCH := $(call get_arch)
--endif
-+override export ARCH := $(call get_arch)
-
- ifeq ($(PKG_CONFIG_CHECKED),)
- ifeq ($(shell command -v $(PKG_CONFIG) && echo y || echo n), n)
-@@ -186,9 +184,9 @@ else
+@@ -193,9 +193,9 @@ else
export WSTRINGOP_TRUNCATION_AVAILABLE
endif
@@ -23,7 +12,7 @@
define create-deps
@cp $(objdir)/$*.d $(objdir)/.deps/$*.P; \
-@@ -209,7 +207,7 @@ export prefix = /usr/local
+@@ -216,7 +216,7 @@ export prefix = /usr/local
export exec_prefix := $(prefix)
export sysconfdir := $(prefix)/etc
export datarootdir := $(prefix)/share
Index: head/devel/pmdk/files/patch-src_common_os__auto__flush__linux.c
===================================================================
--- head/devel/pmdk/files/patch-src_common_os__auto__flush__linux.c
+++ head/devel/pmdk/files/patch-src_common_os__auto__flush__linux.c
@@ -1,11 +0,0 @@
---- src/common/os_auto_flush_linux.c.orig 2018-11-16 20:26:19 UTC
-+++ src/common/os_auto_flush_linux.c
-@@ -75,7 +75,7 @@ check_cpu_cache(const char *domain_path)
- cpu_cache = -1;
- goto end;
- } else if (len == 0) {
-- errno = ENODATA;
-+ errno = EINVAL;
- ERR("read(%d, %p, %d) empty string",
- domain_fd, domain_value,
- DOMAIN_VALUE_LEN);
Index: head/devel/pmdk/files/patch-src_common_os__posix.c
===================================================================
--- head/devel/pmdk/files/patch-src_common_os__posix.c
+++ head/devel/pmdk/files/patch-src_common_os__posix.c
@@ -1,14 +0,0 @@
---- src/common/os_posix.c.orig 2018-10-26 15:43:47 UTC
-+++ src/common/os_posix.c
-@@ -200,9 +200,8 @@ os_posix_fallocate(int fd, os_off_t offset, off_t len)
- if (fstatfs(fd, &fsbuf) == -1 || fstat(fd, &fbuf) == -1)
- return errno;
-
-- size_t reqd_blocks =
-- (((size_t)len + (fsbuf.f_bsize - 1)) / fsbuf.f_bsize)
-- - (size_t)fbuf.st_blocks;
-+ size_t reqd_blocks = (((size_t)len + (fsbuf.f_bsize - 1)) / fsbuf.f_bsize);
-+ reqd_blocks -= fbuf.st_blocks > reqd_blocks ? reqd_blocks : fbuf.st_blocks;
- if (reqd_blocks > (size_t)fsbuf.f_bavail)
- return ENOSPC;
- }
Index: head/devel/pmdk/files/patch-src_common_queue.h
===================================================================
--- head/devel/pmdk/files/patch-src_common_queue.h
+++ head/devel/pmdk/files/patch-src_common_queue.h
@@ -1,13 +0,0 @@
---- src/common/queue.h.orig 2018-10-24 02:57:34 UTC
-+++ src/common/queue.h
-@@ -32,8 +32,8 @@
- * @(#)queue.h 8.5 (Berkeley) 8/20/94
- */
-
--#ifndef _SYS_QUEUE_H_
--#define _SYS_QUEUE_H_
-+#ifndef _COPIED_GLIBC_SYS_QUEUE_H_
-+#define _COPIED_GLIBC_SYS_QUEUE_H_
-
- /*
- * This file defines five types of data structures: singly-linked lists,
Index: head/devel/pmdk/files/patch-src_jemalloc_configure.ac
===================================================================
--- head/devel/pmdk/files/patch-src_jemalloc_configure.ac
+++ head/devel/pmdk/files/patch-src_jemalloc_configure.ac
@@ -0,0 +1,18 @@
+--- src/jemalloc/configure.ac.orig 2019-10-29 20:24:56 UTC
++++ src/jemalloc/configure.ac
+@@ -414,13 +414,13 @@ SAVED_CFLAGS="${CFLAGS}"
+ JE_CFLAGS_APPEND([-Werror])
+ JE_COMPILABLE([tls_model attribute], [],
+ [static __thread int
+- __attribute__((tls_model("initial-exec"))) foo;
++ __attribute__((tls_model("local-dynamic"))) foo;
+ foo = 0;],
+ [je_cv_tls_model])
+ CFLAGS="${SAVED_CFLAGS}"
+ if test "x${je_cv_tls_model}" = "xyes" ; then
+ AC_DEFINE([JEMALLOC_TLS_MODEL],
+- [__attribute__((tls_model("initial-exec")))])
++ [__attribute__((tls_model("local-dynamic")))])
+ else
+ AC_DEFINE([JEMALLOC_TLS_MODEL], [ ])
+ fi
Index: head/devel/pmdk/pkg-plist
===================================================================
--- head/devel/pmdk/pkg-plist
+++ head/devel/pmdk/pkg-plist
@@ -150,6 +150,13 @@
man/man3/pmemobj_direct.3.gz
man/man3/pmemobj_drain.3.gz
man/man3/pmemobj_errormsg.3.gz
+man/man3/pmemobj_f_mem_nodrain.3.gz
+man/man3/pmemobj_f_mem_noflush.3.gz
+man/man3/pmemobj_f_mem_nontemporal.3.gz
+man/man3/pmemobj_f_mem_temporal.3.gz
+man/man3/pmemobj_f_mem_wb.3.gz
+man/man3/pmemobj_f_mem_wc.3.gz
+man/man3/pmemobj_f_relaxed.3.gz
man/man3/pmemobj_first.3.gz
man/man3/pmemobj_flush.3.gz
man/man3/pmemobj_free.3.gz

File Metadata

Mime Type
text/plain
Expires
Mon, Dec 23, 10:51 PM (19 h, 15 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15580603
Default Alt Text
D19504.diff (6 KB)

Event Timeline