diff -Nru julia-1.0.1/debian/changelog julia-1.0.1/debian/changelog --- julia-1.0.1/debian/changelog 2018-10-02 08:35:36.000000000 +0000 +++ julia-1.0.1/debian/changelog 2018-10-15 07:57:30.000000000 +0000 @@ -1,3 +1,11 @@ +julia (1.0.1-0ubuntu2) cosmic; urgency=medium + + [ Mo Zhou ] + * Extend JULIA_CPU_TARGET to include optimized targets as well, + apart from the generic target. (Closes: #910784) + + -- Graham Inggs Mon, 15 Oct 2018 07:57:30 +0000 + julia (1.0.1-0ubuntu1) cosmic; urgency=medium [ Graham Inggs ] diff -Nru julia-1.0.1/debian/rules julia-1.0.1/debian/rules --- julia-1.0.1/debian/rules 2018-10-01 13:04:00.000000000 +0000 +++ julia-1.0.1/debian/rules 2018-10-13 16:31:05.000000000 +0000 @@ -63,11 +63,24 @@ LIBLAPACKNAME=liblapack \ VERBOSE=1 +# Set architecture specific CPU targets. See: #910784 +ifneq (,$(filter $(DEB_HOST_ARCH),amd64 kfreebsd-amd64 x32)) +COMMON_FLAGS += MARCH=x86-64 \ + JULIA_CPU_TARGET="generic;sandybridge,-xsaveopt,clone_all;haswell,-rdrnd,base(1)" +else ifneq (,$(filter $(DEB_HOST_ARCH),i386 hurd-i386 kfreebsd-i386)) +COMMON_FLAGS += MARCH=pentium4 \ + JULIA_CPU_TARGET="pentium4;sandybridge,-xsaveopt,clone_all" +else ifneq (,$(filter $(DEB_HOST_ARCH),armhf)) +COMMON_FLAGS += JULIA_CPU_TARGET="armv7-a;armv7-a,neon;armv7-a,neon,vfp4" +else +COMMON_FLAGS += JULIA_CPU_TARGET="generic" +endif + # Use libopenlibm on architectures that have it ifneq (,$(filter $(DEB_HOST_ARCH),amd64 kfreebsd-amd64 x32)) -COMMON_FLAGS += MARCH=x86-64 USE_SYSTEM_OPENLIBM=1 USE_SYSTEM_LIBM=0 +COMMON_FLAGS += USE_SYSTEM_OPENLIBM=1 USE_SYSTEM_LIBM=0 else ifneq (,$(filter $(DEB_HOST_ARCH),i386 hurd-i386 kfreebsd-i386)) -COMMON_FLAGS += MARCH=pentium4 USE_SYSTEM_OPENLIBM=1 USE_SYSTEM_LIBM=0 +COMMON_FLAGS += USE_SYSTEM_OPENLIBM=1 USE_SYSTEM_LIBM=0 else ifneq (,$(filter $(DEB_HOST_ARCH),arm64 armhf mips mips64el mipsel powerpc ppc64 ppc64el)) COMMON_FLAGS += USE_SYSTEM_OPENLIBM=1 USE_SYSTEM_LIBM=0 else