mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-08-06 05:47:13 +02:00
68 lines
3.9 KiB
Diff
68 lines
3.9 KiB
Diff
on x86 this seems to try symlink it in /usr/lib even when disabled
|
|
--
|
|
diff --git a/Makefile.in b/Makefile.in
|
|
index 3c0621c..25d1635 100644
|
|
--- a/Makefile.in
|
|
+++ b/Makefile.in
|
|
@@ -122,8 +122,6 @@ DIST_COMMON = $(am__configure_deps) \
|
|
@HPLIP_BUILD_TRUE@am__append_12 = libhpip.la
|
|
@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@am__append_13 = prnt/drv/hpijs.drv.in.template \
|
|
@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@ prnt/drv/hpcups.drv.in.template \
|
|
-@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@ prnt/hpcups/libImageProcessor-x86_64.so \
|
|
-@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@ prnt/hpcups/libImageProcessor-x86_32.so \
|
|
@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@ prnt/ipp-usb/HPLIP.conf
|
|
@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@am__append_14 = dat2drv.py install.py hplip-install init-suse-firewall init-iptables-firewall class_rpm_build.sh hplipclassdriver.spec createPPD.sh Makefile_dat2drv hpijs-drv
|
|
@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@am__append_15 = scan/sane/hpaio.desc \
|
|
@@ -774,8 +772,6 @@ am__dist_locatedriver_DATA_DIST = locatedriver
|
|
am__dist_models_DATA_DIST = data/models/models.dat
|
|
am__dist_noinst_DATA_DIST = prnt/drv/hpijs.drv.in.template \
|
|
prnt/drv/hpcups.drv.in.template \
|
|
- prnt/hpcups/libImageProcessor-x86_64.so \
|
|
- prnt/hpcups/libImageProcessor-x86_32.so \
|
|
prnt/ipp-usb/HPLIP.conf scan/sane/hpaio.desc \
|
|
installer/text_install.py data/localization/hplip_de.ts \
|
|
data/localization/hplip_es.ts data/localization/hplip_fr.ts \
|
|
@@ -5215,11 +5211,10 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpijs
|
|
@HPCUPS_INSTALL_TRUE@ prnt/hpcups/flate_colorspace.h prnt/hpcups/RunLenEncoding.h prnt/hpcups/common_defines.h \
|
|
@HPCUPS_INSTALL_TRUE@ prnt/hpcups/genPCLm.h \
|
|
@HPCUPS_INSTALL_TRUE@ common/utils.c common/utils.h prnt/hpcups/Hbpl1_Wrapper.cpp prnt/hpcups/genPCLm.cpp \
|
|
-@HPCUPS_INSTALL_TRUE@ prnt/hpcups/genJPEGStrips.cpp prnt/hpcups/RunLenEncoding.cpp \
|
|
-@HPCUPS_INSTALL_TRUE@ prnt/hpcups/ImageProcessor.h
|
|
+@HPCUPS_INSTALL_TRUE@ prnt/hpcups/genJPEGStrips.cpp prnt/hpcups/RunLenEncoding.cpp
|
|
|
|
@HPCUPS_INSTALL_TRUE@hpcups_CXXFLAGS = $(APDK_ENDIAN_FLAG) $(DBUS_CFLAGS)
|
|
-@HPCUPS_INSTALL_TRUE@hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lImageProcessor -lcups -lcupsimage -lz $(DBUS_LIBS)
|
|
+@HPCUPS_INSTALL_TRUE@hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lcups -lcupsimage -lz $(DBUS_LIBS)
|
|
#else
|
|
#hpcupsdir = $(cupsfilterdir)
|
|
#hpcups_PROGRAMS = hpcups
|
|
@@ -10191,16 +10186,6 @@ uninstall-am: uninstall-apparmor_abstractionDATA \
|
|
|
|
|
|
install-data-hook:
|
|
-@HPLIP_BUILD_TRUE@ if [ \( "$(UNAME)" = "x86_64" -a -d "$(libdir)/" \) ]; then \
|
|
-@HPLIP_BUILD_TRUE@ cp prnt/hpcups/libImageProcessor-x86_64.so $(libdir)/ ; \
|
|
-@HPLIP_BUILD_TRUE@ chmod 775 $(libdir)/libImageProcessor-x86_64.so ; \
|
|
-@HPLIP_BUILD_TRUE@ ln -sf $(libdir)/libImageProcessor-x86_64.so $(libdir)/libImageProcessor.so ; \
|
|
-@HPLIP_BUILD_TRUE@ fi; \
|
|
-@HPLIP_BUILD_TRUE@ if [ \( \( "$(UNAME)" = "i686" -o "$(UNAME)" = "i386" \) -a -d "$(libdir)/" \) ]; then \
|
|
-@HPLIP_BUILD_TRUE@ cp prnt/hpcups/libImageProcessor-x86_32.so $(libdir)/ ; \
|
|
-@HPLIP_BUILD_TRUE@ chmod 775 $(libdir)/libImageProcessor-x86_32.so ; \
|
|
-@HPLIP_BUILD_TRUE@ ln -sf $(libdir)/libImageProcessor-x86_32.so $(libdir)/libImageProcessor.so ; \
|
|
-@HPLIP_BUILD_TRUE@ fi
|
|
@HPLIP_BUILD_TRUE@ if [ -d "/usr/share/ipp-usb/quirks/" ]; then \
|
|
@HPLIP_BUILD_TRUE@ echo "ipp-usb directory exists"; \
|
|
@HPLIP_BUILD_TRUE@ cp prnt/ipp-usb/HPLIP.conf /usr/share/ipp-usb/quirks/ ; \
|
|
diff --git a/hplipclassdriver.spec b/hplipclassdriver.spec
|
|
index 1dc4cce..25bd09e 100644
|
|
--- a/hplipclassdriver.spec
|
|
+++ b/hplipclassdriver.spec
|
|
@@ -10,7 +10,6 @@ Group: Applications
|
|
ldconfig
|
|
semodule -i /usr/share/hplip/selinux/mypol.pp
|
|
#ln -sf /usr/lib/libImageProcessor-x86_64.so /usr/lib/libImageProcessor.so
|
|
-ln -sf /usr/lib/libImageProcessor-x86_32.so /usr/lib/libImageProcessor.so
|
|
%description
|
|
The HP Linux Imaging and Printing (HPLIP) system
|
|
provides a unified single and multi-function connectivity
|